remove obsolete nginx config file

Also send the autoupdatePattern with the stats route
parse mailConfig blob
2017-01-31 18:05:26 -08:00 · 2017-01-31 17:37:55 -08:00 · 2017-01-31 16:36:09 -08:00
2 changed files with 5 additions and 2 deletions
@@ -230,6 +230,8 @@ function configureDefaultServer(callback) {
        safe.child_process.execSync(certCommand);
    }

+    safe.fs.unlinkSync(path.join(paths.NGINX_APPCONFIG_DIR,'ip_based_setup.conf'));
+
    nginx.configureAdmin(certFilePath, keyFilePath, 'default.conf', '', function (error) {
        if (error) return callback(error);

@@ -477,7 +479,8 @@ function sendAliveStatus(callback) {
            },
            mailConfig: {
                enabled: result[settings.MAIL_CONFIG_KEY].enabled
-            }
+            },
+            autoupdatePattern: result[settings.AUTOUPDATE_PATTERN_KEY]
        };

        // Caas Cloudrons do not store appstore credentials in their local database
@@ -590,7 +590,7 @@ function getAll(callback) {
        result[exports.DYNAMIC_DNS_KEY] = !!result[exports.DYNAMIC_DNS_KEY];

        // convert JSON objects
-        [exports.DNS_CONFIG_KEY, exports.TLS_CONFIG_KEY, exports.BACKUP_CONFIG_KEY].forEach(function (key) {
+        [exports.DNS_CONFIG_KEY, exports.TLS_CONFIG_KEY, exports.BACKUP_CONFIG_KEY, exports.MAIL_CONFIG_KEY].forEach(function (key) {
            result[key] = typeof result[key] === 'object' ? result[key] : safe.JSON.parse(result[key]);
        });
Author	SHA1	Message	Date
Girish Ramakrishnan	19a098d34b	remove obsolete nginx config file	2017-01-31 18:05:26 -08:00
Johannes Zellner	db452d9bc0	Also send the autoupdatePattern with the stats route	2017-01-31 17:37:55 -08:00
Johannes Zellner	90efb96635	parse mailConfig blob	2017-01-31 16:36:09 -08:00