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

fix double quotes and config.js.sample

Browse Source
This commit is contained in:
Joseph Bethge 2016-09-29 17:26:32 +02:00
parent f378c93dd3
commit b583140077
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.js.sample
View File

@ -7,8 +7,8 @@
var config = { var config = {
port: 8080, port: 8080,
ipWhitelist: ['127.0.0.1', '::ffff:127.0.0.1'], ipWhitelist: ['127.0.0.1', '::ffff:127.0.0.1'],
// you use ips with subnet mask: ['127.0.0.1', '127.0.0.1/24'] // you can use ips with subnet mask: ['127.0.0.1', '127.0.0.1/24']
// you use also use ip ranges: ['127.0.0.1', ['192.168.0.1', '192.168.0.100']] // you can also use ip ranges: ['127.0.0.1', ['192.168.0.1', '192.168.0.100']]
language: 'en', language: 'en',
timeFormat: 24, timeFormat: 24,

1
js/defaults.js
View File

@ -10,6 +10,7 @@
var defaults = { var defaults = {
port: 8080, port: 8080,
kioskmode: false, kioskmode: false,
ipWhitelist: ['127.0.0.1', '::ffff:127.0.0.1'],
language: "en", language: "en",
timeFormat: 24, timeFormat: 24,

6
js/server.js
View File

@ -10,19 +10,19 @@ var app = require("express")();
var server = require("http").Server(app); var server = require("http").Server(app);
var io = require("socket.io")(server); var io = require("socket.io")(server);
var path = require("path"); var path = require("path");
var ipfilter = require('express-ipfilter').IpFilter; var ipfilter = require("express-ipfilter").IpFilter;
var Server = function(config, callback) { var Server = function(config, callback) {
console.log("Starting server op port " + config.port + " ... "); console.log("Starting server op port " + config.port + " ... ");
server.listen(config.port); server.listen(config.port);
if (config.ipWhitelist === undefined) { if (config.ipWhitelist === undefined) {
config.ipWhitelist = ['127.0.0.1', '::ffff:127.0.0.1']; config.ipWhitelist = ["127.0.0.1", "::ffff:127.0.0.1"];
console.log("Warning: Missing value (ipWhitelist) from config.js, assuming default (localhost access only): " + config.ipWhitelist); console.log("Warning: Missing value (ipWhitelist) from config.js, assuming default (localhost access only): " + config.ipWhitelist);
} }
app.use(function(req, res, next) { app.use(function(req, res, next) {
var result = ipfilter(config.ipWhitelist, {mode: 'allow', log: false})(req, res, function(err) { var result = ipfilter(config.ipWhitelist, {mode: "allow", log: false})(req, res, function(err) {
if (err === undefined) { if (err === undefined) {
return next(); return next();
} }