fix eslint errors

This commit is contained in:
Jaap-Jan de Wit 2020-08-23 18:56:25 +00:00
parent 1b611e67c8
commit ab67481e99

View File

@ -147,22 +147,22 @@ const internalCertificate = {
// 4. Request cert // 4. Request cert
return internalCertificate.requestLetsEncryptCloudFlareDnsSsl(certificate, data.meta.cloudflare_token); return internalCertificate.requestLetsEncryptCloudFlareDnsSsl(certificate, data.meta.cloudflare_token);
}) })
.then(internalNginx.reload) .then(internalNginx.reload)
.then(() => { .then(() => {
// 6. Re-instate previously disabled hosts // 6. Re-instate previously disabled hosts
return internalCertificate.enableInUseHosts(in_use_result); return internalCertificate.enableInUseHosts(in_use_result);
}) })
.then(() => { .then(() => {
return certificate; return certificate;
}) })
.catch((err) => { .catch((err) => {
// In the event of failure, revert things and throw err back // In the event of failure, revert things and throw err back
return internalCertificate.enableInUseHosts(in_use_result) return internalCertificate.enableInUseHosts(in_use_result)
.then(internalNginx.reload) .then(internalNginx.reload)
.then(() => { .then(() => {
throw err; throw err;
}); });
}); });
} else { } else {
// 3. Generate the LE config // 3. Generate the LE config
return internalNginx.generateLetsEncryptRequestConfig(certificate) return internalNginx.generateLetsEncryptRequestConfig(certificate)
@ -784,7 +784,7 @@ const internalCertificate = {
let storeKey = 'echo "dns_cloudflare_api_token = ' + apiToken + '" > ' + tokenLoc; let storeKey = 'echo "dns_cloudflare_api_token = ' + apiToken + '" > ' + tokenLoc;
let cmd = let cmd =
storeKey + " && " + storeKey + ' && ' +
certbot_command + ' certonly --non-interactive ' + certbot_command + ' certonly --non-interactive ' +
'--cert-name "npm-' + certificate.id + '" ' + '--cert-name "npm-' + certificate.id + '" ' +
'--agree-tos ' + '--agree-tos ' +
@ -799,9 +799,9 @@ const internalCertificate = {
} }
return utils.exec(cmd).then((result) => { return utils.exec(cmd).then((result) => {
logger.info(result); logger.info(result);
return result; return result;
}); });
}, },