reverseproxy: rename to writeDefaultConfig

This commit is contained in:
Girish Ramakrishnan
2019-09-30 15:28:05 -07:00
parent cfde6e31ad
commit d891d39587
2 changed files with 6 additions and 6 deletions

View File

@@ -17,12 +17,12 @@ exports = module.exports = {
renewCerts: renewCerts,
// the 'configure' ensure a certificate and generate nginx config
configureDefaultServer: configureDefaultServer,
configureAdmin: configureAdmin,
configureApp: configureApp,
unconfigureApp: unconfigureApp,
// these only generate nginx config
writeDefaultConfig: writeDefaultConfig,
writeAdminConfig: writeAdminConfig,
writeAppConfig: writeAppConfig,
@@ -621,18 +621,18 @@ function removeAppConfigs() {
}
}
function configureDefaultServer(callback) {
function writeDefaultConfig(callback) {
assert.strictEqual(typeof callback, 'function');
var certFilePath = path.join(paths.NGINX_CERT_DIR, 'default.cert');
var keyFilePath = path.join(paths.NGINX_CERT_DIR, 'default.key');
if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
debug('configureDefaultServer: create new cert');
debug('writeDefaultConfig: create new cert');
var cn = 'cloudron-' + (new Date()).toISOString(); // randomize date a bit to keep firefox happy
if (!safe.child_process.execSync(`openssl req -x509 -newkey rsa:2048 -keyout ${keyFilePath} -out ${certFilePath} -days 3650 -subj /CN=${cn} -nodes`)) {
debug(`configureDefaultServer: could not generate certificate: ${safe.error.message}`);
debug(`writeDefaultConfig: could not generate certificate: ${safe.error.message}`);
return callback(safe.error);
}
}
@@ -640,7 +640,7 @@ function configureDefaultServer(callback) {
writeAdminNginxConfig({ certFilePath, keyFilePath }, constants.NGINX_DEFAULT_CONFIG_FILE_NAME, '', function (error) {
if (error) return callback(error);
debug('configureDefaultServer: done');
debug('writeDefaultConfig: done');
callback(null);
});