diff --git a/src/cloudron.js b/src/cloudron.js index 915a6c5fb..6ef893ec7 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -128,7 +128,7 @@ function runStartupTasks() { function (callback) { if (!settings.adminDomain()) return callback(); - reverseProxy.writeAdminConfig(settings.adminDomain(), callback); + reverseProxy.writeDashboardConfig(settings.adminDomain(), callback); }, // check activation state and start the platform @@ -318,7 +318,7 @@ function setDashboardDomain(domain, auditSource, callback) { domains.get(domain, function (error, domainObject) { if (error) return callback(error); - reverseProxy.writeAdminConfig(domain, function (error) { + reverseProxy.writeDashboardConfig(domain, function (error) { if (error) return callback(error); const fqdn = domains.fqdn(constants.ADMIN_LOCATION, domainObject); diff --git a/src/reverseproxy.js b/src/reverseproxy.js index 9f3c4a34a..9eea535ea 100644 --- a/src/reverseproxy.js +++ b/src/reverseproxy.js @@ -23,7 +23,7 @@ exports = module.exports = { writeDefaultConfig, removeDefaultConfig, - writeAdminConfig, + writeDashboardConfig, writeAppConfig, removeAppConfigs, @@ -367,7 +367,7 @@ function ensureCertificate(vhost, domain, auditSource, callback) { }); } -function writeAdminNginxConfig(bundle, configFileName, vhost, callback) { +function writeDashboardNginxConfig(bundle, configFileName, vhost, callback) { assert.strictEqual(typeof bundle, 'object'); assert.strictEqual(typeof configFileName, 'string'); assert.strictEqual(typeof vhost, 'string'); @@ -404,16 +404,16 @@ function configureAdmin(domain, auditSource, callback) { ensureCertificate(adminFqdn, domainObject.domain, auditSource, function (error, bundle) { if (error) return callback(error); - writeAdminNginxConfig(bundle, `${adminFqdn}.conf`, adminFqdn, callback); + writeDashboardNginxConfig(bundle, `${adminFqdn}.conf`, adminFqdn, callback); }); }); } -function writeAdminConfig(domain, callback) { +function writeDashboardConfig(domain, callback) { assert.strictEqual(typeof domain, 'string'); assert.strictEqual(typeof callback, 'function'); - debug(`writeAdminConfig: writing admin config for ${domain}`); + debug(`writeDashboardConfig: writing admin config for ${domain}`); domains.get(domain, function (error, domainObject) { if (error) return callback(error); @@ -423,7 +423,7 @@ function writeAdminConfig(domain, callback) { getCertificate(adminFqdn, domainObject.domain, function (error, bundle) { if (error) return callback(error); - writeAdminNginxConfig(bundle, `${adminFqdn}.conf`, adminFqdn, callback); + writeDashboardNginxConfig(bundle, `${adminFqdn}.conf`, adminFqdn, callback); }); }); } @@ -612,11 +612,11 @@ function renewCerts(options, auditSource, progressCallback, callback) { // reconfigure since the cert changed if (appDomain.type === 'webadmin') { - return writeAdminNginxConfig(bundle, `${settings.adminFqdn()}.conf`, settings.adminFqdn(), iteratorCallback); + return writeDashboardNginxConfig(bundle, `${settings.adminFqdn()}.conf`, settings.adminFqdn(), iteratorCallback); } else if (appDomain.type === 'webadmin+mail') { return async.series([ mail.handleCertChanged, - writeAdminNginxConfig.bind(null, bundle, `${settings.adminFqdn()}.conf`, settings.adminFqdn()) + writeDashboardNginxConfig.bind(null, bundle, `${settings.adminFqdn()}.conf`, settings.adminFqdn()) ], iteratorCallback); } else if (appDomain.type === 'main') { return writeAppNginxConfig(appDomain.app, bundle, iteratorCallback); @@ -664,7 +664,7 @@ function writeDefaultConfig(callback) { } } - writeAdminNginxConfig({ certFilePath, keyFilePath }, constants.NGINX_DEFAULT_CONFIG_FILE_NAME, '', function (error) { + writeDashboardNginxConfig({ certFilePath, keyFilePath }, constants.NGINX_DEFAULT_CONFIG_FILE_NAME, '', function (error) { if (error) return callback(error); debug('writeDefaultConfig: done');