remove unused httpPaths from manifest

This commit is contained in:
Girish Ramakrishnan
2021-11-09 21:50:12 -08:00
parent 48b75accdd
commit 68db4524f1
4 changed files with 3 additions and 11 deletions
+1 -2
View File
@@ -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);
}
-7
View File
@@ -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
-1
View File
@@ -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);