From 66eb99e5068cd69d394946d0c635e4d8012f0b13 Mon Sep 17 00:00:00 2001 From: Joseph Bethge Date: Thu, 29 Sep 2016 17:49:54 +0200 Subject: [PATCH] transfer usage information to readme --- README.md | 2 ++ config/config.js.sample | 4 +--- js/defaults.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d86cca7c..986e600b 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,8 @@ The following properties can be configured: | **Option** | **Description** | | --- | --- | | `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. | +| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1"]`.It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`). + | | `kioskmode` | This allows MagicMirror² to run in Kiosk Mode. It protects from other programs popping on top of your screen. The default value is `false`| | `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. | | `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. | diff --git a/config/config.js.sample b/config/config.js.sample index 933b62fd..269492ba 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -6,9 +6,7 @@ var config = { port: 8080, - ipWhitelist: ['127.0.0.1', '::ffff:127.0.0.1'], - // you can use ips with subnet mask: ['127.0.0.1', '127.0.0.1/24'] - // you can also use ip ranges: ['127.0.0.1', ['192.168.0.1', '192.168.0.100']] + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1"], language: 'en', timeFormat: 24, diff --git a/js/defaults.js b/js/defaults.js index d1d78bce..e2ee6151 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -10,7 +10,7 @@ var defaults = { port: 8080, kioskmode: false, - ipWhitelist: ['127.0.0.1', '::ffff:127.0.0.1'], + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1"], language: "en", timeFormat: 24,