From 54542f7f076e830267d7bba384d3693b9b032247 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Sun, 5 Apr 2020 23:00:38 +0200 Subject: [PATCH] added basename config use basename in socket.io path fix #1973 --- CHANGELOG.md | 2 ++ config/config.js.sample | 2 ++ js/defaults.js | 1 + js/socketclient.js | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a33fe958..16ab8239 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). # 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 diff --git a/config/config.js.sample b/config/config.js.sample index 414054da..514a92f9 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -15,6 +15,8 @@ var config = { // - "0.0.0.0", "::" to listen on any interface // Default, when address config is left out or empty, is "localhost" 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 // 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"], diff --git a/js/defaults.js b/js/defaults.js index 08c4d945..b005e70c 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -15,6 +15,7 @@ if (typeof(mmPort) !== "undefined") { var defaults = { address: address, port: port, + basename: "/", kioskmode: false, electronOptions: {}, ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], diff --git a/js/socketclient.js b/js/socketclient.js index ee30f267..2eb2c6b8 100644 --- a/js/socketclient.js +++ b/js/socketclient.js @@ -9,7 +9,7 @@ var MMSocket = function(moduleName) { // Private Methods self.socket = io("/" + self.moduleName, { - path: window.location.pathname + "socket.io" + path: config.basename + "socket.io" }); var notificationCallback = function() {};