From 484e75ac34ace3fd9af09c25981bf3d574247089 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 28 Jun 2016 10:34:59 +0200 Subject: [PATCH] nwo creating configfile per certificate all right --- dist/index.js | 6 +++--- package.json | 2 +- test/test.js | 4 ++-- test/test.ts | 2 +- ts/index.ts | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/index.js b/dist/index.js index 10819b5..3cfce55 100644 --- a/dist/index.js +++ b/dist/index.js @@ -53,8 +53,8 @@ var updateSslDirSync = function (sslDirArg, domainNameArg) { plugins.smartfile.fs.copySync(plugins.path.join(domainCertFolder, "fullchain.pem"), plugins.path.join(sslDirArg, domainNameArg, "fullchain.pem")); plugins.smartfile.fs.copySync(plugins.path.join(domainCertFolder, "privkey.pem"), plugins.path.join(sslDirArg, domainNameArg, "privkey.pem")); // create cert config - var certRegex = /.*\-([]0-9]*)\.pem/; - var certFileNameWithTime = plugins.smartfile.fs.listFilesSync(domainCertFolder, certRegex)[1]; + var certRegex = /.*\-([0-9]*)\.pem/; + var certFileNameWithTime = plugins.smartfile.fs.listFilesSync(domainCertFolder, certRegex)[0]; var certTime = parseInt(certRegex.exec(certFileNameWithTime)[1]); var certConfig = { domainName: domainNameArg, @@ -68,4 +68,4 @@ var updateSslDirSync = function (sslDirArg, domainNameArg) { var updateGitOrigin = function () { }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import * as plugins from \"./cert.plugins\";\nimport * as paths from \"./cert.paths\";\n\nexport class Cert {\n    private _cfEmail: string;\n    private _cfKey: string;\n    private _sslDir: string;\n    certificatesPresent:Certificate[];\n    certificatesValid:Certificate[];\n    gitOriginRepo;\n    constructor(optionsArg: {\n        cfEmail: string,\n        cfKey: string,\n        sslDir: string,\n        gitOriginRepo?: string\n    }) {\n        this._cfEmail = optionsArg.cfEmail;\n        this._cfKey = optionsArg.cfKey;\n        this._sslDir = optionsArg.sslDir;\n        this.gitOriginRepo = optionsArg.gitOriginRepo;\n        let config = {\n            cfEmail: this._cfEmail,\n            cfKey: this._cfKey\n        }\n        plugins.smartfile.memory.toFsSync(JSON.stringify(config),plugins.path.join(__dirname, \"assets/config.json\"));\n    };\n    getDomainCert(domainNameArg: string,optionsArg?:{force:boolean}) {\n        let done = plugins.q.defer();\n        if (!checkDomainsStillValid(domainNameArg) || optionsArg.force) {\n            plugins.shelljs.exec(\"chmod 700 \" + paths.letsencryptSh);\n            plugins.shelljs.exec(\"chmod 700 \" + paths.certHook);\n            plugins.shelljs.exec(\"bash -c \\\"\" + paths.letsencryptSh + \" -c -d \" + domainNameArg + \" -t dns-01 -k \" + paths.certHook + \" -o \" + paths.certDir + \"\\\"\");\n            let fetchedCertsArray:string[] = plugins.smartfile.fs.listFoldersSync(paths.certDir);\n            if(fetchedCertsArray.indexOf(domainNameArg) != -1){\n                updateSslDirSync(this._sslDir,domainNameArg);\n            }\n            done.resolve();\n        } else {\n            plugins.beautylog.info(\"certificate for \" + domainNameArg + \" is still valid! Not fetching new one!\");\n            done.resolve();\n        }\n        return done.promise;\n    };\n}\n\nexport class Certificate {\n    domainName: string;\n    creationDate: Date;\n    expiryDate: Date;\n    constructor() {\n\n    };\n}\n\ninterface certConfig {\n    domainName:string;\n    created:number;\n    expires:number;\n}\n\nlet checkDomainsStillValid = (domainNameArg: string): boolean => {\n    return false;\n}\n\nlet updateSslDirSync = (sslDirArg:string,domainNameArg:string) => {\n    plugins.smartfile.fs.ensureDirSync(sslDirArg);\n    let domainCertFolder = plugins.path.join(paths.certDir,domainNameArg)\n    if(plugins.smartfile.fs.listFoldersSync(paths.certDir).indexOf(domainNameArg) != -1) {\n        plugins.smartfile.fs.copySync(\n            plugins.path.join(domainCertFolder,\"fullchain.pem\"),\n            plugins.path.join(sslDirArg,domainNameArg,\"fullchain.pem\")\n        );\n        plugins.smartfile.fs.copySync(\n            plugins.path.join(domainCertFolder,\"privkey.pem\"),\n            plugins.path.join(sslDirArg,domainNameArg,\"privkey.pem\")\n        );\n        // create cert config\n        let certRegex = /.*\\-([]0-9]*)\\.pem/;\n        let certFileNameWithTime = plugins.smartfile.fs.listFilesSync(domainCertFolder,certRegex)[1];\n        let certTime = parseInt(certRegex.exec(certFileNameWithTime)[1]);\n        let certConfig:certConfig = {\n            domainName: domainNameArg,\n            created: certTime,\n            expires: certTime + 7776000\n        };\n        plugins.smartfile.memory.toFs(\n            JSON.stringify(certConfig),\n            plugins.path.join(sslDirArg,domainNameArg,\"config.json\")\n        );\n    };\n}\n\nlet updateGitOrigin = () => {\n\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import * as plugins from \"./cert.plugins\";\nimport * as paths from \"./cert.paths\";\n\nexport class Cert {\n    private _cfEmail: string;\n    private _cfKey: string;\n    private _sslDir: string;\n    certificatesPresent:Certificate[];\n    certificatesValid:Certificate[];\n    gitOriginRepo;\n    constructor(optionsArg: {\n        cfEmail: string,\n        cfKey: string,\n        sslDir: string,\n        gitOriginRepo?: string\n    }) {\n        this._cfEmail = optionsArg.cfEmail;\n        this._cfKey = optionsArg.cfKey;\n        this._sslDir = optionsArg.sslDir;\n        this.gitOriginRepo = optionsArg.gitOriginRepo;\n        let config = {\n            cfEmail: this._cfEmail,\n            cfKey: this._cfKey\n        }\n        plugins.smartfile.memory.toFsSync(JSON.stringify(config),plugins.path.join(__dirname, \"assets/config.json\"));\n    };\n    getDomainCert(domainNameArg: string,optionsArg?:{force:boolean}) {\n        let done = plugins.q.defer();\n        if (!checkDomainsStillValid(domainNameArg) || optionsArg.force) {\n            plugins.shelljs.exec(\"chmod 700 \" + paths.letsencryptSh);\n            plugins.shelljs.exec(\"chmod 700 \" + paths.certHook);\n            plugins.shelljs.exec(\"bash -c \\\"\" + paths.letsencryptSh + \" -c -d \" + domainNameArg + \" -t dns-01 -k \" + paths.certHook + \" -o \" + paths.certDir + \"\\\"\");\n            let fetchedCertsArray:string[] = plugins.smartfile.fs.listFoldersSync(paths.certDir);\n            if(fetchedCertsArray.indexOf(domainNameArg) != -1){\n                updateSslDirSync(this._sslDir,domainNameArg);\n            }\n            done.resolve();\n        } else {\n            plugins.beautylog.info(\"certificate for \" + domainNameArg + \" is still valid! Not fetching new one!\");\n            done.resolve();\n        }\n        return done.promise;\n    };\n}\n\nexport class Certificate {\n    domainName: string;\n    creationDate: Date;\n    expiryDate: Date;\n    constructor() {\n\n    };\n}\n\ninterface certConfig {\n    domainName:string;\n    created:number;\n    expires:number;\n}\n\nlet checkDomainsStillValid = (domainNameArg: string): boolean => {\n    return false;\n}\n\nlet updateSslDirSync = (sslDirArg:string,domainNameArg:string) => {\n    plugins.smartfile.fs.ensureDirSync(sslDirArg);\n    let domainCertFolder = plugins.path.join(paths.certDir,domainNameArg)\n    if(plugins.smartfile.fs.listFoldersSync(paths.certDir).indexOf(domainNameArg) != -1) {\n        plugins.smartfile.fs.copySync(\n            plugins.path.join(domainCertFolder,\"fullchain.pem\"),\n            plugins.path.join(sslDirArg,domainNameArg,\"fullchain.pem\")\n        );\n        plugins.smartfile.fs.copySync(\n            plugins.path.join(domainCertFolder,\"privkey.pem\"),\n            plugins.path.join(sslDirArg,domainNameArg,\"privkey.pem\")\n        );\n        // create cert config\n        let certRegex = /.*\\-([0-9]*)\\.pem/;\n        let certFileNameWithTime:string = plugins.smartfile.fs.listFilesSync(domainCertFolder,certRegex)[0];\n        let certTime = parseInt(certRegex.exec(certFileNameWithTime)[1]);\n        let certConfig:certConfig = {\n            domainName: domainNameArg,\n            created: certTime,\n            expires: certTime + 7776000\n        };\n        plugins.smartfile.memory.toFs(\n            JSON.stringify(certConfig),\n            plugins.path.join(sslDirArg,domainNameArg,\"config.json\")\n        );\n    };\n}\n\nlet updateGitOrigin = () => {\n\n}"]} diff --git a/package.json b/package.json index a7bf53b..5b8de47 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "q": "^1.4.1", "shelljs": "^0.7.0", "smartcli": "^1.0.4", - "smartfile": "^4.0.7", + "smartfile": "^4.0.8", "smartgit": "0.1.0", "smartstring": "^2.0.10", "typings-global": "^1.0.3" diff --git a/test/test.js b/test/test.js index e0ab7b7..f5184cc 100644 --- a/test/test.js +++ b/test/test.js @@ -27,11 +27,11 @@ describe("cert", function () { }); it("should get a valid certificate", function (done) { this.timeout(120000); - testCert.getDomainCert("sub7.bleu.de").then(function () { + testCert.getDomainCert("sub9.bleu.de").then(function () { done(); }); }); }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixxQkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsSUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFFOUIsd0JBQTJCLGlCQUFpQixDQUFDLENBQUE7QUFDN0MsSUFBWSxJQUFJLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFHdEMsSUFBSSxRQUFRLEdBQUcsSUFBSSxXQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztBQUVsRSxJQUFJLFFBQWtCLENBQUM7QUFFdkIsUUFBUSxDQUFDLE1BQU0sRUFBQztJQUNaLFFBQVEsQ0FBQyxTQUFTLEVBQUM7UUFDZixFQUFFLENBQUMsZ0NBQWdDLEVBQUMsVUFBUyxJQUFJO1lBQzdDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsc0JBQVksRUFBRSxDQUFDLElBQUksQ0FBQztnQkFDaEIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFDRixRQUFRLENBQUMsTUFBTSxFQUFDO1FBQ1osRUFBRSxDQUFDLDRDQUE0QyxFQUFDO1lBQzVDLFFBQVEsR0FBRyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUM7Z0JBQ3JCLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVE7Z0JBQzdCLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU07Z0JBQ3pCLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxhQUFhLENBQUM7YUFDakQsQ0FBQyxDQUFDO1lBQ0gsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQyxVQUFTLElBQUk7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNyQixRQUFRLENBQUMsYUFBYSxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQztnQkFDeEMsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIjtcbmltcG9ydCB7UWVudn0gZnJvbSBcInFlbnZcIjtcbmltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XG5cbmltcG9ydCB7c3RhcnRJbnN0YWxsfSBmcm9tIFwiLi4vZGlzdC9pbnN0YWxsXCI7XG5pbXBvcnQgKiBhcyBjZXJ0IGZyb20gXCIuLi9kaXN0L2luZGV4XCI7XG5cblxubGV0IHRlc3RRZW52ID0gbmV3IFFlbnYocHJvY2Vzcy5jd2QoKSwgcHJvY2Vzcy5jd2QoKSArIFwiLy5ub2dpdFwiKTtcblxubGV0IHRlc3RDZXJ0OmNlcnQuQ2VydDtcblxuZGVzY3JpYmUoXCJjZXJ0XCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcImluc3RhbGxcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBkb3dubG9hZCBsZXRzZW5jcnlwdC5zaFwiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDUwMDApO1xuICAgICAgICAgICAgc3RhcnRJbnN0YWxsKCkudGhlbigoKSA9PiB7XG4gICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgfSlcbiAgICAgICAgfSlcbiAgICB9KVxuICAgIGRlc2NyaWJlKFwiQ2VydFwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGl0KFwic2hvdWxkIGNyZWF0ZSBhIG5ldyBDZXJ0IG9iamVjdCBmcm9tIGNsYXNzXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRlc3RDZXJ0ID0gbmV3IGNlcnQuQ2VydCh7XG4gICAgICAgICAgICAgICAgY2ZFbWFpbDogcHJvY2Vzcy5lbnYuQ0ZfRU1BSUwsXG4gICAgICAgICAgICAgICAgY2ZLZXk6IHByb2Nlc3MuZW52LkNGX0tFWSxcbiAgICAgICAgICAgICAgICBzc2xEaXI6IHBhdGguam9pbihwcm9jZXNzLmN3ZCgpLFwidGVzdC9hc3NldHNcIilcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgdGVzdENlcnQuc2hvdWxkLmJlLmluc3RhbmNlb2YoY2VydC5DZXJ0KTtcbiAgICAgICAgfSlcbiAgICAgICAgaXQoXCJzaG91bGQgZ2V0IGEgdmFsaWQgY2VydGlmaWNhdGVcIixmdW5jdGlvbihkb25lKXtcbiAgICAgICAgICAgIHRoaXMudGltZW91dCgxMjAwMDApO1xuICAgICAgICAgICAgdGVzdENlcnQuZ2V0RG9tYWluQ2VydChcInN1YjcuYmxldS5kZVwiKS50aGVuKCgpID0+IHtcbiAgICAgICAgICAgICAgICBkb25lKCk7XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfSlcbiAgICB9KVxufSk7Il19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixxQkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsSUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFFOUIsd0JBQTJCLGlCQUFpQixDQUFDLENBQUE7QUFDN0MsSUFBWSxJQUFJLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFHdEMsSUFBSSxRQUFRLEdBQUcsSUFBSSxXQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztBQUVsRSxJQUFJLFFBQWtCLENBQUM7QUFFdkIsUUFBUSxDQUFDLE1BQU0sRUFBQztJQUNaLFFBQVEsQ0FBQyxTQUFTLEVBQUM7UUFDZixFQUFFLENBQUMsZ0NBQWdDLEVBQUMsVUFBUyxJQUFJO1lBQzdDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsc0JBQVksRUFBRSxDQUFDLElBQUksQ0FBQztnQkFDaEIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFDRixRQUFRLENBQUMsTUFBTSxFQUFDO1FBQ1osRUFBRSxDQUFDLDRDQUE0QyxFQUFDO1lBQzVDLFFBQVEsR0FBRyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUM7Z0JBQ3JCLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVE7Z0JBQzdCLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU07Z0JBQ3pCLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxhQUFhLENBQUM7YUFDakQsQ0FBQyxDQUFDO1lBQ0gsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQyxVQUFTLElBQUk7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNyQixRQUFRLENBQUMsYUFBYSxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQztnQkFDeEMsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIjtcbmltcG9ydCB7UWVudn0gZnJvbSBcInFlbnZcIjtcbmltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XG5cbmltcG9ydCB7c3RhcnRJbnN0YWxsfSBmcm9tIFwiLi4vZGlzdC9pbnN0YWxsXCI7XG5pbXBvcnQgKiBhcyBjZXJ0IGZyb20gXCIuLi9kaXN0L2luZGV4XCI7XG5cblxubGV0IHRlc3RRZW52ID0gbmV3IFFlbnYocHJvY2Vzcy5jd2QoKSwgcHJvY2Vzcy5jd2QoKSArIFwiLy5ub2dpdFwiKTtcblxubGV0IHRlc3RDZXJ0OmNlcnQuQ2VydDtcblxuZGVzY3JpYmUoXCJjZXJ0XCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcImluc3RhbGxcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBkb3dubG9hZCBsZXRzZW5jcnlwdC5zaFwiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDUwMDApO1xuICAgICAgICAgICAgc3RhcnRJbnN0YWxsKCkudGhlbigoKSA9PiB7XG4gICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgfSlcbiAgICAgICAgfSlcbiAgICB9KVxuICAgIGRlc2NyaWJlKFwiQ2VydFwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGl0KFwic2hvdWxkIGNyZWF0ZSBhIG5ldyBDZXJ0IG9iamVjdCBmcm9tIGNsYXNzXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRlc3RDZXJ0ID0gbmV3IGNlcnQuQ2VydCh7XG4gICAgICAgICAgICAgICAgY2ZFbWFpbDogcHJvY2Vzcy5lbnYuQ0ZfRU1BSUwsXG4gICAgICAgICAgICAgICAgY2ZLZXk6IHByb2Nlc3MuZW52LkNGX0tFWSxcbiAgICAgICAgICAgICAgICBzc2xEaXI6IHBhdGguam9pbihwcm9jZXNzLmN3ZCgpLFwidGVzdC9hc3NldHNcIilcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgdGVzdENlcnQuc2hvdWxkLmJlLmluc3RhbmNlb2YoY2VydC5DZXJ0KTtcbiAgICAgICAgfSlcbiAgICAgICAgaXQoXCJzaG91bGQgZ2V0IGEgdmFsaWQgY2VydGlmaWNhdGVcIixmdW5jdGlvbihkb25lKXtcbiAgICAgICAgICAgIHRoaXMudGltZW91dCgxMjAwMDApO1xuICAgICAgICAgICAgdGVzdENlcnQuZ2V0RG9tYWluQ2VydChcInN1YjkuYmxldS5kZVwiKS50aGVuKCgpID0+IHtcbiAgICAgICAgICAgICAgICBkb25lKCk7XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfSlcbiAgICB9KVxufSk7Il19 diff --git a/test/test.ts b/test/test.ts index 91ba5f3..efb81fe 100644 --- a/test/test.ts +++ b/test/test.ts @@ -31,7 +31,7 @@ describe("cert",function(){ }) it("should get a valid certificate",function(done){ this.timeout(120000); - testCert.getDomainCert("sub7.bleu.de").then(() => { + testCert.getDomainCert("sub9.bleu.de").then(() => { done(); }); }) diff --git a/ts/index.ts b/ts/index.ts index 20f49e1..878b39b 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -75,8 +75,8 @@ let updateSslDirSync = (sslDirArg:string,domainNameArg:string) => { plugins.path.join(sslDirArg,domainNameArg,"privkey.pem") ); // create cert config - let certRegex = /.*\-([]0-9]*)\.pem/; - let certFileNameWithTime = plugins.smartfile.fs.listFilesSync(domainCertFolder,certRegex)[1]; + let certRegex = /.*\-([0-9]*)\.pem/; + let certFileNameWithTime:string = plugins.smartfile.fs.listFilesSync(domainCertFolder,certRegex)[0]; let certTime = parseInt(certRegex.exec(certFileNameWithTime)[1]); let certConfig:certConfig = { domainName: domainNameArg,