Compare commits

...

4 Commits

Author SHA1 Message Date
AJ ONeal
03fdbe157a
chore(release): bump to v2.2.4 2024-05-13 13:03:14 -06:00
AJ ONeal
0393b1ae3a
chore: add 'npm run bump' 2024-05-13 13:03:08 -06:00
AJ ONeal
16637c4f67
fix: skip (instead of fail) when pems.bundle is unavailable 2024-05-13 13:03:08 -06:00
c834d1603d v2.2.3: node v6 promisify fix, eliminate external deps 2019-04-16 00:29:18 -06:00
3 changed files with 42 additions and 8 deletions

View File

@ -8,6 +8,9 @@ try {
PromiseA = Promise; PromiseA = Promise;
} }
var util = require('util'); var util = require('util');
if (!util.promisify) {
util.promisify = PromiseA.promisify;
}
function promisifyAll(obj) { function promisifyAll(obj) {
var aobj = {}; var aobj = {};
Object.keys(obj).forEach(function (key) { Object.keys(obj).forEach(function (key) {
@ -15,7 +18,7 @@ function promisifyAll(obj) {
}); });
return aobj; return aobj;
} }
var mkdirpAsync = util.promisify(require('mkdirp')); var mkdirpAsync = util.promisify(require('@root/mkdirp'));
var path = require('path'); var path = require('path');
var fs = require('fs'); var fs = require('fs');
var readFileAsync = util.promisify(fs.readFile); var readFileAsync = util.promisify(fs.readFile);
@ -277,13 +280,17 @@ module.exports.create = function (configs) {
var bundleArchive = path.join(archiveDir, 'bundle' + checkpoints + '.pem'); var bundleArchive = path.join(archiveDir, 'bundle' + checkpoints + '.pem');
return mkdirpAsync(archiveDir).then(function () { return mkdirpAsync(archiveDir).then(function () {
return PromiseA.all([ var ps = [
sfs.writeFileAsync(certArchive, pems.cert, 'ascii') sfs.writeFileAsync(certArchive, pems.cert, 'ascii')
, sfs.writeFileAsync(chainArchive, pems.chain, 'ascii') , sfs.writeFileAsync(chainArchive, pems.chain, 'ascii')
, sfs.writeFileAsync(fullchainArchive, [ pems.cert, pems.chain ].join('\n'), 'ascii') , sfs.writeFileAsync(fullchainArchive, [ pems.cert, pems.chain ].join('\n'), 'ascii')
, sfs.writeFileAsync(privkeyArchive, pems.privkey, 'ascii') , sfs.writeFileAsync(privkeyArchive, pems.privkey, 'ascii')
, sfs.writeFileAsync(bundleArchive, pems.bundle, 'ascii') ];
]); if (pems.bundle) {
var bundleP = sfs.writeFileAsync(bundleArchive, pems.bundle, 'ascii');
ps.push(bundleP);
}
return PromiseA.all(ps);
}).then(function () { }).then(function () {
return mkdirpAsync(liveDir); return mkdirpAsync(liveDir);
}).then(function () { }).then(function () {

26
package-lock.json generated Normal file
View File

@ -0,0 +1,26 @@
{
"name": "le-store-certbot",
"version": "2.2.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@root/mkdirp": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@root/mkdirp/-/mkdirp-1.0.0.tgz",
"integrity": "sha512-hxGAYUx5029VggfG+U9naAhQkoMSXtOeXtbql97m3Hi6/sQSRL/4khKZPyOF6w11glyCOU38WCNLu9nUcSjOfA=="
},
"pyconf": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/pyconf/-/pyconf-1.1.7.tgz",
"integrity": "sha512-v4clh33m68sjtMsh8XMpjhGWb/MQODAYZ1y7ORG5Qv58UK25OddoB+oXyexgDkK8ttFui/lZm2sQDgA2Ftjfkw==",
"requires": {
"safe-replace": "^1.0.2"
}
},
"safe-replace": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-replace/-/safe-replace-1.1.0.tgz",
"integrity": "sha512-9/V2E0CDsKs9DWOOwJH7jYpSl9S3N05uyevNjvsnDauBqRowBPOyot1fIvV5N2IuZAbYyvrTXrYFVG0RZInfFw=="
}
}
}

View File

@ -1,9 +1,10 @@
{ {
"name": "le-store-certbot", "name": "le-store-certbot",
"version": "2.2.2", "version": "2.2.4",
"description": "The \"certbot\" storage strategy for Greenlock.js", "description": "The \"certbot\" storage strategy for Greenlock.js",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"bump": "npm version -m \"chore(release): bump to v%s\"",
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"repository": { "repository": {
@ -27,8 +28,8 @@
"bluebird": "^3.5.1" "bluebird": "^3.5.1"
}, },
"dependencies": { "dependencies": {
"mkdirp": "^0.5.1", "@root/mkdirp": "^1.0.0",
"pyconf": "^1.1.5", "pyconf": "^1.1.7",
"safe-replace": "^1.0.3" "safe-replace": "^1.1.0"
} }
} }