1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge pull request #2953 from node-red/depreacte-usage-of-httpRoot-and-add-warning

Deprecate usage of httpRoot and add warning
This commit is contained in:
Nick O'Leary 2021-04-23 16:42:01 +01:00 committed by GitHub
commit 62f2a552ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions

View File

@ -181,6 +181,9 @@ function start() {
if (settings.settingsFile) { if (settings.settingsFile) {
log.info(log._("runtime.paths.settings",{path:settings.settingsFile})); log.info(log._("runtime.paths.settings",{path:settings.settingsFile}));
} }
if (settings.httpRoot !== undefined) {
log.warn(log._("server.deprecatedOption",{old:"httpRoot", new: "httpNodeRoot/httpAdminRoot"));
}
if (settings.httpStatic) { if (settings.httpStatic) {
log.info(log._("runtime.paths.httpStatic",{path:path.resolve(settings.httpStatic)})); log.info(log._("runtime.paths.httpStatic",{path:path.resolve(settings.httpStatic)}));
} }

View File

@ -42,7 +42,7 @@
"uninstall-failed-long": "Uninstall of module __name__ failed:", "uninstall-failed-long": "Uninstall of module __name__ failed:",
"uninstalled": "Uninstalled module: __name__" "uninstalled": "Uninstalled module: __name__"
}, },
"deprecatedOption": "Use of __old__ is deprecated. Use __new__ instead", "deprecatedOption": "Use of __old__ is DEPRECATED. Use __new__ instead",
"unable-to-listen": "Unable to listen on __listenpath__", "unable-to-listen": "Unable to listen on __listenpath__",
"port-in-use": "Error: port in use", "port-in-use": "Error: port in use",
"uncaught-exception": "Uncaught Exception:", "uncaught-exception": "Uncaught Exception:",
@ -50,7 +50,7 @@
"now-running": "Server now running at __listenpath__", "now-running": "Server now running at __listenpath__",
"failed-to-start": "Failed to start server:", "failed-to-start": "Failed to start server:",
"headless-mode": "Running in headless mode", "headless-mode": "Running in headless mode",
"httpadminauth-deprecated": "use of httpAdminAuth is deprecated. Use adminAuth instead", "httpadminauth-deprecated": "Use of httpAdminAuth is DEPRECATED. Use adminAuth instead",
"https": { "https": {
"refresh-interval": "Refreshing https settings every __interval__ hours", "refresh-interval": "Refreshing https settings every __interval__ hours",
"settings-refreshed": "Server https settings have been refreshed", "settings-refreshed": "Server https settings have been refreshed",

View File

@ -96,10 +96,6 @@ module.exports = {
// disabled. // disabled.
//httpNodeRoot: '/red-nodes', //httpNodeRoot: '/red-nodes',
// The following property can be used in place of 'httpAdminRoot' and 'httpNodeRoot',
// to apply the same root to both parts.
//httpRoot: '/red',
// When httpAdminRoot is used to move the UI to a different root path, the // When httpAdminRoot is used to move the UI to a different root path, the
// following property can be used to identify a directory of static content // following property can be used to identify a directory of static content
// that should be served at http://localhost:1880/. // that should be served at http://localhost:1880/.