jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make reverseProxy.configureAdmin not use config

Browse Source 
This way we can set things up before modifying config for dashboard switch
This commit is contained in:
Girish Ramakrishnan
2018-12-13 21:42:47 -08:00
parent 3137dbec33
commit f0dbf2fc4d
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/reverseproxy.js
View File

@@ -398,14 +398,21 @@ function writeAdminConfig(bundle, configFileName, vhost, callback) {
reload(callback);
}
function configureAdmin(auditSource, callback) {
function configureAdmin(domain, auditSource, callback) {
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof auditSource, 'object');
assert.strictEqual(typeof callback, 'function');
ensureCertificate(config.adminFqdn(), config.adminDomain(), auditSource, function (error, bundle) {
domains.get(domain, function (error, domainObject) {
if (error) return callback(error);
writeAdminConfig(bundle, constants.NGINX_ADMIN_CONFIG_FILE_NAME, config.adminFqdn(), callback);
const adminFqdn = domains.fqdn(constants.ADMIN_LOCATION, domainObject);
ensureCertificate(adminFqdn, domainObject.domain, auditSource, function (error, bundle) {
if (error) return callback(error);
writeAdminConfig(bundle, constants.NGINX_ADMIN_CONFIG_FILE_NAME, adminFqdn, callback);
});
});
}