From b62e4f6662b02bbf47d4d70381e84410e38f341b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 26 Apr 2021 14:43:06 +0100
Subject: [PATCH] Fix deprecation of httpRoot

---
 packages/node_modules/@node-red/runtime/lib/index.js | 2 +-
 packages/node_modules/node-red/red.js                | 1 -
 packages/node_modules/node-red/settings.js           | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index d95076e86..fd3fda721 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -182,7 +182,7 @@ function start() {
                     log.info(log._("runtime.paths.settings",{path:settings.settingsFile}));
                 }
                 if (settings.httpRoot !== undefined) {
-                    log.warn(log._("server.deprecatedOption",{old:"httpRoot", new: "httpNodeRoot/httpAdminRoot"));
+                    log.warn(log._("server.deprecatedOption",{old:"httpRoot", new: "httpNodeRoot/httpAdminRoot"}));
                 }
                 if (settings.httpStatic) {
                     log.info(log._("runtime.paths.httpStatic",{path:path.resolve(settings.httpStatic)}));
diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js
index 55e355a7c..436537873 100755
--- a/packages/node_modules/node-red/red.js
+++ b/packages/node_modules/node-red/red.js
@@ -263,7 +263,6 @@ httpsPromise.then(function(startupHttps) {
         settings.httpAdminRoot = false;
         settings.httpNodeRoot = false;
     } else {
-        settings.httpRoot = settings.httpRoot||"/";
         settings.disableEditor = settings.disableEditor||false;
     }
 
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index 9fb20f9ce..b0243180f 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -106,7 +106,7 @@ module.exports = {
     //apiMaxLength: '5mb',
 
     // If you installed the optional node-red-dashboard you can set it's path
-    // relative to httpRoot
+    // relative to httpNodeRoot
     // Other optional properties include
     //  readOnly:{boolean},
     //  middleware:{function or array}, (req,res,next) - http middleware