summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Mehren2020-11-29 15:51:43 +0100
committerGitHub2020-11-29 15:51:43 +0100
commita5d835cb74db33184e52a810231fd583b5c9afdb (patch)
tree183ef2a903854aae1cfb7ee1dbcb059e0d3f10a0 /lib
parent42a50a7302b2da939db5e3285a3da754c5f4a3a3 (diff)
parentc83c6cb226ada0403dcbee2e07380f7012cf6f1a (diff)
Merge pull request #597 from hedgedoc/fix/install-docs
Diffstat (limited to 'lib')
-rw-r--r--lib/config/index.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/config/index.js b/lib/config/index.js
index 6aab2e28..1657ba7a 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -128,7 +128,7 @@ config.isOAuth2Enable = config.oauth2.clientID && config.oauth2.clientSecret
// Check gitlab api version
if (config.gitlab && config.gitlab.version !== 'v4' && config.gitlab.version !== 'v3') {
- logger.warn('config.js contains wrong version (' + config.gitlab.version + ') for gitlab api; it should be \'v3\' or \'v4\'. Defaulting to v4')
+ logger.warn('config.json contains wrong version (' + config.gitlab.version + ') for gitlab api; it should be \'v3\' or \'v4\'. Defaulting to v4')
config.gitlab.version = 'v4'
}
// If gitlab scope is api, enable snippets Export/import
@@ -149,7 +149,7 @@ for (let i = keys.length; i--;) {
if (uppercase.test(keys[i]) &&
config[lowercaseKey] !== undefined &&
fileConfig[keys[i]] === undefined) {
- logger.warn('config.js contains deprecated lowercase setting for ' + keys[i] + '. Please change your config.js file to replace ' + lowercaseKey + ' with ' + keys[i])
+ logger.warn('config.json contains deprecated lowercase setting for ' + keys[i] + '. Please change your config.json file to replace ' + lowercaseKey + ' with ' + keys[i])
config[keys[i]] = config[lowercaseKey]
}
}
@@ -161,7 +161,7 @@ if (Object.keys(process.env).toString().indexOf('HMD_') !== -1) {
// Generate session secret if it stays on default values
if (config.sessionSecret === 'secret') {
- logger.warn('Session secret not set. Using random generated one. Please set `sessionSecret` in your config.js file. All users will be logged out.')
+ logger.warn('Session secret not set. Using random generated one. Please set `sessionSecret` in your config.json file. All users will be logged out.')
config.sessionSecret = crypto.randomBytes(Math.ceil(config.sessionSecretLen / 2)) // generate crypto graphic random number
.toString('hex') // convert to hexadecimal format
.slice(0, config.sessionSecretLen) // return required number of characters