added basename config

use basename in socket.io path fix #1973
This commit is contained in:
Leon Kiefer 2020-04-05 23:00:38 +02:00
parent ca3275757b
commit 54542f7f07
4 changed files with 6 additions and 1 deletions

View File

@ -15,6 +15,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
# Deleted # Deleted
### Fixed
- The broken modules due to Socket.io change from last release [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
## [2.11.0] - 2020-04-01 ## [2.11.0] - 2020-04-01

View File

@ -15,6 +15,8 @@ var config = {
// - "0.0.0.0", "::" to listen on any interface // - "0.0.0.0", "::" to listen on any interface
// Default, when address config is left out or empty, is "localhost" // Default, when address config is left out or empty, is "localhost"
port: 8080, port: 8080,
basename: "/", // The URL pathname where MagicMirror is hosted. If you are using a Reverse proxy
// you must set the sub path here. basename must end with a /
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
// or add a specific IPv4 of 192.168.1.5 : // or add a specific IPv4 of 192.168.1.5 :
// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"], // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],

View File

@ -15,6 +15,7 @@ if (typeof(mmPort) !== "undefined") {
var defaults = { var defaults = {
address: address, address: address,
port: port, port: port,
basename: "/",
kioskmode: false, kioskmode: false,
electronOptions: {}, electronOptions: {},
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],

View File

@ -9,7 +9,7 @@ var MMSocket = function(moduleName) {
// Private Methods // Private Methods
self.socket = io("/" + self.moduleName, { self.socket = io("/" + self.moduleName, {
path: window.location.pathname + "socket.io" path: config.basename + "socket.io"
}); });
var notificationCallback = function() {}; var notificationCallback = function() {};