liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use env PORT if defined

Browse Source
This commit is contained in:
NGPixel 2017-04-18 20:31:07 -04:00
parent 32ac3a9fac
commit bad59d1a99
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/config.js
View File

@ -33,6 +33,16 @@ module.exports = (confPaths) => {
appconfig = _.defaultsDeep(appconfig, appdata.defaults.config)
// Using ENV variables?
if (appconfig.port < 1) {
appconfig.port = process.env.PORT || 80
}
if (_.startsWith(appconfig.db, '$')) {
appconfig.db = process.env[appconfig.db.slice(1)]
}
// List authentication strategies
if (appdata.capabilities.manyAuthProviders) {

6
libs/db.js
View File

@ -54,12 +54,6 @@ module.exports = {
self[modelName] = require(path.join(dbModelsPath, file))
})
// Using ENV variable?
if (_.startsWith(appconfig.db, '$')) {
appconfig.db = process.env[appconfig.db.slice(1)]
}
// Connect
self.onReady = modb.connect(appconfig.db)

4
views/configure/index.pug
View File

@ -95,8 +95,8 @@ html(data-logic='configure')
section
p.control
label.label Port
input(type='text', placeholder='e.g. 80', v-model.number='conf.port', data-vv-scope='general', name='ipt-port', v-validate='{ required: true, numeric: true, min_value: 1, max_value: 65535 }')
span.desc The port on which Wiki.js will listen to. Usually port 80 if connecting directly, or a random port (e.g. 3000) if using a web server in front of it.
input(type='text', placeholder='e.g. 80', v-model.number='conf.port', data-vv-scope='general', name='ipt-port', v-validate='{ required: true, numeric: true, min_value: 0, max_value: 65535 }')
span.desc The port on which Wiki.js will listen to. Usually port 80 if connecting directly, or a random port (e.g. 3000) if using a web server in front of it.<br>Set <strong>0</strong> to use $PORT system environment variable.
section
p.control
label.label Site UI Language