coolaj86
/
le-store-certbot.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nix deprecated stuff

This commit is contained in:
AJ ONeal 2016-08-08 13:10:27 -04:00
parent 91981120b4
commit d69bcd7e58
1 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
index.js
View File

@ -230,24 +230,14 @@ module.exports.create = function (configs) {
, fs.statAsync(args.certPath) // 3 , fs.statAsync(args.certPath) // 3
]).then(function (arr) { ]).then(function (arr) {
return { return {
key: arr[0] // privkey.pem privkey: arr[0] // privkey.pem
, privkey: arr[0] // privkey.pem
// TODO for haproxy
, fullchain: arr[1] + '\r\n' + arr[2] // fullchain.pem
, cert: arr[1] // cert.pem , cert: arr[1] // cert.pem
, chain: arr[2] // chain.pem
/* /*
// TODO populate these values only if they are known
, issuedAt: arr[3].mtime.valueOf() , issuedAt: arr[3].mtime.valueOf()
, expiresAt: arr[3].mtime.valueOf() + (90 * 24 * 60 * 60 * 100) , expiresAt: arr[3].mtime.valueOf() + (90 * 24 * 60 * 60 * 100)
*/ */
, chain: arr[2] // chain.pem
, ca: arr[2] // chain.pem
, privkeyPath: args.privkeyPath
, fullchainPath: args.fullchainPath
, certPath: args.certPath
, chainPath: args.chainPath
}; };
}, function (err) { }, function (err) {
if (args.debug) { if (args.debug) {
@ -262,8 +252,6 @@ module.exports.create = function (configs) {
var pyobj = args.pyobj; var pyobj = args.pyobj;
var pems = args.pems; var pems = args.pems;
// TODO for haproxy
pems.fullchain = pems.cert + '\r\n' + (pems.chain || pems.ca);
pyobj.checkpoints = parseInt(pyobj.checkpoints, 10) || 0; pyobj.checkpoints = parseInt(pyobj.checkpoints, 10) || 0;
var liveDir = args.liveDir || path.join(args.configDir, 'live', args.domains[0]); var liveDir = args.liveDir || path.join(args.configDir, 'live', args.domains[0]);
@ -286,8 +274,8 @@ module.exports.create = function (configs) {
return mkdirpAsync(archiveDir).then(function () { return mkdirpAsync(archiveDir).then(function () {
return PromiseA.all([ return PromiseA.all([
sfs.writeFileAsync(certArchive, pems.cert, 'ascii') sfs.writeFileAsync(certArchive, pems.cert, 'ascii')
, sfs.writeFileAsync(chainArchive, (pems.chain || pems.ca), 'ascii') , sfs.writeFileAsync(chainArchive, pems.chain, 'ascii')
, sfs.writeFileAsync(fullchainArchive, pems.fullchain, 'ascii') , sfs.writeFileAsync(fullchainArchive, pems.cert + pems.chain, 'ascii')
, sfs.writeFileAsync( , sfs.writeFileAsync(
privkeyArchive privkeyArchive
// TODO nix args.key, args.domainPrivateKeyPem ?? // TODO nix args.key, args.domainPrivateKeyPem ??
@ -300,8 +288,8 @@ module.exports.create = function (configs) {
}).then(function () { }).then(function () {
return PromiseA.all([ return PromiseA.all([
sfs.writeFileAsync(certPath, pems.cert, 'ascii') sfs.writeFileAsync(certPath, pems.cert, 'ascii')
, sfs.writeFileAsync(chainPath, (pems.chain || pems.ca), 'ascii') , sfs.writeFileAsync(chainPath, pems.chain, 'ascii')
, sfs.writeFileAsync(fullchainPath, pems.fullchain, 'ascii') , sfs.writeFileAsync(fullchainPath, pems.cert + pems.chain, 'ascii')
, sfs.writeFileAsync( , sfs.writeFileAsync(
privkeyPath privkeyPath
// TODO nix args.key, args.domainPrivateKeyPem ?? // TODO nix args.key, args.domainPrivateKeyPem ??
@ -316,29 +304,19 @@ module.exports.create = function (configs) {
return writeRenewalConfig(args); return writeRenewalConfig(args);
}).then(function () { }).then(function () {
return { return {
certPath: certPath privkey: pems.privkey
, chainPath: chainPath
, fullchainPath: fullchainPath
, privkeyPath: privkeyPath
// TODO nix keypair
, keypair: args.domainKeypair
// TODO nix args.key, args.domainPrivateKeyPem ??
// some ambiguity here...
, privkey: (pems.privkey || pems.key) //|| RSA.exportPrivatePem(args.domainKeypair)
, fullchain: pems.fullchain || (pems.cert + pems.chain)
, chain: (pems.chain || pems.ca)
// especially this one... might be cert only, might be fullchain
, cert: pems.cert , cert: pems.cert
, chain: pems.chain
/* /*
// TODO populate these only if they are actually known
, issuedAt: Date.now() , issuedAt: Date.now()
, expiresAt: Date.now() + (90 * 24 * 60 * 60 * 100) , expiresAt: Date.now() + (90 * 24 * 60 * 60 * 100)
*/ */
}; };
}); });
} }
} }
// //