feat: removed waffle link + added git author config

This commit is contained in:
NGPixel 2017-04-25 22:04:11 -04:00
parent 57299dbabd
commit 86eb7a427d
4 changed files with 11 additions and 12 deletions

View File

@ -19,7 +19,6 @@
- [Requirements](#requirements) - [Requirements](#requirements)
- [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) - [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md)
- [Feature Requests](https://wikijs.canny.io/features) - [Feature Requests](https://wikijs.canny.io/features)
- [Project Planning](https://waffle.io/Requarks/wiki)
- [Milestones](#milestones) - [Milestones](#milestones)
- [Chat with us](#gitter) - [Chat with us](#gitter)
- [Special Thanks](#special-thanks) - [Special Thanks](#special-thanks)

View File

@ -50,9 +50,8 @@ defaults:
password: null password: null
privateKey: null privateKey: null
sslVerify: true sslVerify: true
signature: serverEmail: wiki@example.com
name: Wiki showUserEmail: true
email: wiki@example.com
features: features:
mathjax: true mathjax: true
externalLogging: externalLogging:

View File

@ -127,9 +127,12 @@ git:
privateKey: /etc/wiki/keys/git.pem privateKey: /etc/wiki/keys/git.pem
sslVerify: true sslVerify: true
signature:
name: Marty # Default email to use as commit author
email: marty@example.com serverEmail: marty@example.com
# Whether to use user email as author in commits
showUserEmail: true
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Features # Features

View File

@ -20,8 +20,7 @@ module.exports = {
exists: false exists: false
}, },
_signature: { _signature: {
name: 'Wiki', email: 'wiki@example.com'
email: 'user@example.com'
}, },
_opts: { _opts: {
clone: {}, clone: {},
@ -52,8 +51,7 @@ module.exports = {
// Define signature // Define signature
if (appconfig.git) { if (appconfig.git) {
self._signature.name = appconfig.git.signature.name || 'Wiki' self._signature.email = appconfig.git.serverEmail || 'wiki@example.com'
self._signature.email = appconfig.git.signature.email || 'user@example.com'
} }
return self return self
@ -102,7 +100,7 @@ module.exports = {
self._url = URL.format(urlObj) self._url = URL.format(urlObj)
let gitConfigs = [ let gitConfigs = [
() => { return self._git.exec('config', ['--local', 'user.name', self._signature.name]) }, () => { return self._git.exec('config', ['--local', 'user.name', 'Wiki']) },
() => { return self._git.exec('config', ['--local', 'user.email', self._signature.email]) }, () => { return self._git.exec('config', ['--local', 'user.email', self._signature.email]) },
() => { return self._git.exec('config', ['--local', '--bool', 'http.sslVerify', _.toString(appconfig.git.auth.sslVerify)]) } () => { return self._git.exec('config', ['--local', '--bool', 'http.sslVerify', _.toString(appconfig.git.auth.sslVerify)]) }
] ]