diff --git a/CHANGES b/CHANGES index 93a431669..8a5f15126 100644 --- a/CHANGES +++ b/CHANGES @@ -2387,8 +2387,9 @@ * restore: do not redirect until mail data has been restored * proxyauth: set viewport meta tag in login view -[7.0.4] +[7.1.0] * Add password reveal button to login pages * appstore: fix crash if account already registered * Do not nuke all the logrotate configs on update +* Remove unused httpPaths from manifest diff --git a/src/apptask.js b/src/apptask.js index 33c0b0793..f4a7f598f 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -565,7 +565,6 @@ async function update(app, args, progressCallback) { // app does not want these addons anymore // FIXME: this does not handle option changes (like multipleDatabases) const unusedAddons = _.omit(app.manifest.addons, Object.keys(updateConfig.manifest.addons)); - const httpPathsChanged = app.manifest.httpPaths !== updateConfig.manifest.httpPaths; const httpPortChanged = app.manifest.httpPort !== updateConfig.manifest.httpPort; const proxyAuthChanged = !_.isEqual(safe.query(app.manifest, 'addons.proxyAuth'), safe.query(updateConfig.manifest, 'addons.proxyAuth')); @@ -630,7 +629,7 @@ async function update(app, args, progressCallback) { await startApp(app); await progressCallback({ percent: 90, message: 'Configuring reverse proxy' }); - if (httpPathsChanged || proxyAuthChanged || httpPortChanged) { + if (proxyAuthChanged || httpPortChanged) { await reverseProxy.configureApp(app, AuditSource.APPTASK); } diff --git a/src/nginxconfig.ejs b/src/nginxconfig.ejs index e5b6e3b49..1165d7c13 100644 --- a/src/nginxconfig.ejs +++ b/src/nginxconfig.ejs @@ -301,13 +301,6 @@ server { } <% } %> - <% Object.keys(httpPaths).forEach(function (path) { -%> - location "<%= path %>" { - # the trailing / will replace part of the original URI matched by the location. - proxy_pass http://<%= ip %>:<%= httpPaths[path] %>/; - } - <% }); %> - <% } else if ( endpoint === 'redirect' ) { %> location / { # redirect everything to the app. this is temporary because there is no way diff --git a/src/reverseproxy.js b/src/reverseproxy.js index d54a33656..be8aa7818 100644 --- a/src/reverseproxy.js +++ b/src/reverseproxy.js @@ -507,7 +507,6 @@ async function writeAppNginxConfig(app, fqdn, bundle) { id: app.id, location: nginxLocation(safe.query(app.manifest, 'addons.proxyAuth.path') || '/') }, - httpPaths: app.manifest.httpPaths || {}, ocsp: await isOcspEnabled(bundle.certFilePath) }; const nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);