mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-15 15:44:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Automatically enable protocolUseSSL when useSSL is set

Browse source 
This makes the behavior consistent with the docs and
 saves the user from having to both set
 `useSSL` and `protocolUseSSL`.

Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
David Mehren 2021-05-04 11:51:06 +02:00
parent 140b2c261c
commit aece96f539
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/config/index.js
View file

@ -1,4 +1,3 @@
'use strict' 'use strict'
const crypto = require('crypto') const crypto = require('crypto')
@ -31,7 +30,7 @@ const packageConfig = {
} }
const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE || const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE ||
'config.json') 'config.json')
const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined
let config = require('./default') let config = require('./default')
@ -88,6 +87,14 @@ config.isStandardHTTPPort = (function isStandardHTTPPort () {
return !config.useSSL && config.port === 80 return !config.useSSL && config.port === 80
})() })()
// Use HTTPS protocol if the internal TLS server is enabled
if (config.useSSL === true) {
if (config.protocolUseSSL === false) {
logger.warn('Overriding protocolUseSSL to \'true\' as useSSL is enabled.')
}
config.protocolUseSSL = true
}
// cache serverURL // cache serverURL
config.serverURL = (function getserverurl () { config.serverURL = (function getserverurl () {
let url = '' let url = ''