6.3.4 changes

reverseproxy: remove any old dashboard domain configs
(cherry picked from commit c052882de9)
2021-06-27 09:00:09 -07:00 · 2021-06-27 08:59:43 -07:00
2 changed files with 7 additions and 1 deletions
--- a/3
+++ b/3
@@ -2295,3 +2295,6 @@
 * mail: enable sieve extension editheader
 * mail: update solr to 8.9.0

+[6.3.4]
+* Fix issue where old nginx configs where not removed before upgrade
+
--- a/src/reverseproxy.js
+++ b/src/reverseproxy.js
@@ -788,8 +788,11 @@ function checkCerts(options, auditSource, progressCallback, callback) {
 }

 function removeAppConfigs() {
+    const dashboardConfigFilename = `${settings.dashboardFqdn()}.conf`;
+
+    // remove all configs which are not the default or current dashboard
    for (let appConfigFile of fs.readdirSync(paths.NGINX_APPCONFIG_DIR)) {
-        if (appConfigFile !== constants.NGINX_DEFAULT_CONFIG_FILE_NAME && !appConfigFile.startsWith(constants.DASHBOARD_LOCATION)) {
+        if (appConfigFile !== constants.NGINX_DEFAULT_CONFIG_FILE_NAME && appConfigFile !== dashboardConfigFilename) {
            fs.unlinkSync(path.join(paths.NGINX_APPCONFIG_DIR, appConfigFile));
        }
    }
Author	SHA1	Message	Date
Girish Ramakrishnan	700a7637b6	6.3.4 changes	2021-06-27 09:00:09 -07:00
Girish Ramakrishnan	feb61c27d9	reverseproxy: remove any old dashboard domain configs (cherry picked from commit `c052882de9`)	2021-06-27 08:59:43 -07:00