Merge pull request #670 from joola/feature/#669

#669 do not override JOOLA_CONFIG_INTERFACES_WEBSERVER_PORT if set.
joola · Feb 18, 2015 · a25ae36 · a25ae36
2 parents 8f2fb7e + a1362f8
commit a25ae36
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/common/config.js b/lib/common/config.js
@@ -22,7 +22,7 @@ var
 var config = exports;
 
 /* istanbul ignore if */
-if (process.env.PORT)
+if (process.env.PORT && !process.env.JOOLA_CONFIG_INTERFACES_WEBSERVER_PORT)
   process.env.JOOLA_CONFIG_INTERFACES_WEBSERVER_PORT = process.env.PORT;
 
 config.overrideWithEnvironment = function () {