From bad59d1a991414b01cff514ea96ad31ebe5da305 Mon Sep 17 00:00:00 2001
From: NGPixel <ngpixel@gmail.com>
Date: Tue, 18 Apr 2017 20:31:07 -0400
Subject: [PATCH] Use env PORT if defined

---
 libs/config.js            | 10 ++++++++++
 libs/db.js                |  6 ------
 views/configure/index.pug |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libs/config.js b/libs/config.js
index cfd7712d..80b67707 100644
--- a/libs/config.js
+++ b/libs/config.js
@@ -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) {
diff --git a/libs/db.js b/libs/db.js
index 4ad4a40f..aad0395d 100644
--- a/libs/db.js
+++ b/libs/db.js
@@ -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)
diff --git a/views/configure/index.pug b/views/configure/index.pug
index 40c4c095..4d2c8449 100644
--- a/views/configure/index.pug
+++ b/views/configure/index.pug
@@ -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