kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #676 from roramirez/hotfix/MM_PORT

Browse Source 
hotfix PL #673
This commit is contained in:
Michael Teeuw 2017-02-01 07:45:28 +01:00 committed by GitHub
commit a9a90c5545
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/app.js
View File

@ -21,6 +21,11 @@ if (process.env.MM_CONFIG_FILE) {
global.configuration_file = process.env.MM_CONFIG_FILE;
}
//Hotfix PullRequest #673
if (process.env.MM_PORT) {
global.mmPort = process.env.MM_PORT;
}
// The next part is here to prevent a major exception when there
// is no internet connection. This could probable be solved better.
process.on("uncaughtException", function (err) {

6
js/defaults.js
View File

@ -7,8 +7,12 @@
* MIT Licensed.
*/
var port = 8080;
if (typeof(mmPort) !== "undefined") {
port = mmPort;
}
var defaults = {
port: process.env.MM_PORT || 8080,
port: port,
kioskmode: false,
electronOptions: {},
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],