mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-28 04:02:12 +00:00
659e0c74cb
… for setting these things from outside (and overriding corresponding config.js properties `config.foreignModulesDir` and `customCss`) - remove elements from index.html when loading script or stylesheet files fails - removed `config.paths.vendor` (could never work because `vendor` is hardcoded in `index.html`) and renamed `config.paths.modules` to `config.foreignModulesDir`. The `config.paths. ...` properties were implemented in the initial commit in `js/defaults.js` but were never functional. - fixes `app.js` which didn't respect `config.paths.modules` before - as `modules/defaults` is directly set in many places in the source code restrict `config.paths.modules` to foreign modules (it has never worked for default modules), now renamed to `config.foreignModulesDir` - adds new `/env` section in `server.js` for getting the new env vars in the browser - fixes TODO in `server.js` so test directories are now only published when running tests These changes allow changing some main paths from outside mm with the new env vars. You now **can** put all user stuff into one directory, e.g. the `config` dir: - `config.js` as before - `custom.css` - foreign modules This would simplify other setups e.g. the docker setup. At the moment we have to deal with 3 directories where 2 of them (`modules` and `css`) contains mixed stuff, which means mm owned files and user files. This can now simplified and leads to cleaner setups (if wanted).
83 lines
2.3 KiB
JavaScript
83 lines
2.3 KiB
JavaScript
/* global mmPort */
|
|
|
|
const address = "localhost";
|
|
let port = 8080;
|
|
if (typeof mmPort !== "undefined") {
|
|
port = mmPort;
|
|
}
|
|
const defaults = {
|
|
address: address,
|
|
port: port,
|
|
basePath: "/",
|
|
kioskmode: false,
|
|
electronOptions: {},
|
|
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
|
|
|
|
language: "en",
|
|
logLevel: ["INFO", "LOG", "WARN", "ERROR"],
|
|
timeFormat: 24,
|
|
units: "metric",
|
|
zoom: 1,
|
|
customCss: "css/custom.css",
|
|
foreignModulesDir: "modules",
|
|
// httpHeaders used by helmet, see https://helmetjs.github.io/. You can add other/more object values by overriding this in config.js,
|
|
// e.g. you need to add `frameguard: false` for embedding MagicMirror in another website, see https://github.com/MagicMirrorOrg/MagicMirror/issues/2847
|
|
httpHeaders: { contentSecurityPolicy: false, crossOriginOpenerPolicy: false, crossOriginEmbedderPolicy: false, crossOriginResourcePolicy: false, originAgentCluster: false },
|
|
|
|
// properties for checking if server is alive and has same startup-timestamp, the check is per default enabled
|
|
// (interval 30 seconds). If startup-timestamp has changed the client reloads the magicmirror webpage.
|
|
checkServerInterval: 30 * 1000,
|
|
reloadAfterServerRestart: false,
|
|
|
|
modules: [
|
|
{
|
|
module: "updatenotification",
|
|
position: "top_center"
|
|
},
|
|
{
|
|
module: "helloworld",
|
|
position: "upper_third",
|
|
classes: "large thin",
|
|
config: {
|
|
text: "MagicMirror²"
|
|
}
|
|
},
|
|
{
|
|
module: "helloworld",
|
|
position: "middle_center",
|
|
config: {
|
|
text: "Please create a config file or check the existing one for errors."
|
|
}
|
|
},
|
|
{
|
|
module: "helloworld",
|
|
position: "middle_center",
|
|
classes: "small dimmed",
|
|
config: {
|
|
text: "See README for more information."
|
|
}
|
|
},
|
|
{
|
|
module: "helloworld",
|
|
position: "middle_center",
|
|
classes: "xsmall",
|
|
config: {
|
|
text: "If you get this message while your config file is already created,<br>" + "it probably contains an error. To validate your config file run in your MagicMirror² directory<br>" + "<pre>npm run config:check</pre>"
|
|
}
|
|
},
|
|
{
|
|
module: "helloworld",
|
|
position: "bottom_bar",
|
|
classes: "xsmall dimmed",
|
|
config: {
|
|
text: "www.michaelteeuw.nl"
|
|
}
|
|
}
|
|
]
|
|
};
|
|
|
|
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
|
if (typeof module !== "undefined") {
|
|
module.exports = defaults;
|
|
}
|