request via cloudflare dns working

This commit is contained in:
Jaap-Jan de Wit
2020-08-23 12:50:41 +00:00
parent b9a95840e0
commit ff1770204c
4 changed files with 55 additions and 4 deletions

View File

@ -146,7 +146,11 @@ const internalCertificate = {
.then(internalNginx.reload)
.then(() => {
// 4. Request cert
return internalCertificate.requestLetsEncryptSsl(certificate);
if (data.meta.cloudflare_use) {
return internalCertificate.requestLetsEncryptCloudFlareDnsSsl(certificate, data.meta.cloudflare_token);
} else {
return internalCertificate.requestLetsEncryptSsl(certificate);
}
})
.then(() => {
// 5. Remove LE config
@ -748,6 +752,40 @@ const internalCertificate = {
});
},
/**
* @param {Object} certificate the certificate row
* @param {String} apiToken the cloudflare api token
* @returns {Promise}
*/
requestLetsEncryptCloudFlareDnsSsl: (certificate, apiToken) => {
logger.info('Requesting Let\'sEncrypt certificates via Cloudflare DNS for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));
let tokenLoc = '~/cloudflare-token';
let storeKey = 'echo "dns_cloudflare_api_token = ' + apiToken + '" > ' + tokenLoc;
let cmd = certbot_command + ' certonly --non-interactive ' +
'--cert-name "npm-' + certificate.id + '" ' +
'--agree-tos ' +
'--email "' + certificate.meta.letsencrypt_email + '" ' +
'--domains "' + certificate.domain_names.join(',') + '" ' +
'--dns-cloudflare --dns-cloudflare-credentials ' + tokenLoc + ' ' +
(le_staging ? '--staging' : '');
if (debug_mode) {
logger.info('Command:', cmd);
}
return utils.exec(storeKey).then((result) => {
utils.exec(cmd).then((result) => {
utils.exec('rm ' + tokenLoc).then(result => {
logger.success(result);
return result;
});
});
});
},
/**
* @param {Access} access
* @param {Object} data

View File

@ -41,6 +41,12 @@
},
"letsencrypt_agree": {
"type": "boolean"
},
"cloudflare_use": {
"type": "boolean"
},
"cloudflare_token": {
"type": "string"
}
}
}