diff --git a/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/meta.json b/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/meta.json new file mode 100644 index 0000000..20b0c06 --- /dev/null +++ b/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/meta.json @@ -0,0 +1 @@ +{"creation_host":"Philipps-MBP.fritz.box","creation_dt":"2016-10-24T00:06:02.884Z"} \ No newline at end of file diff --git a/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/private_key.json b/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/private_key.json new file mode 100644 index 0000000..858f8cb --- /dev/null +++ b/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/private_key.json @@ -0,0 +1 @@ +{"kty":"RSA","n":"7_P1VlbLtqrK4VHFSWLJ3FErJQLVr-Jh5WyaqFes92ARB4DrbckoMIGUFnSgOfCjwFd_XzNc8OTxqX7_9cW9DWukpLSj7pZ2JhpzdB_U5OnUCGgG0Vn66dTdLJTXPeZSNZiAd4AuBncgwHomY_VwWwfNexuajndxqS-Coe2kkigAB_dYrHiPHPn6MP3a9pZrw0l_9TggOnE414eJgs0v_MP6Qpy1IJfYZoDTcYXeOsangGKSLiUJVXWXXy00plSdepr5HX_fncYu0QQ9fAx2MmYwZcx2LFmFpimcm2NDugtpt5vsxYf3m00aZ4jeg4RNn_dvX-EuPP-Eb3FKJulqvw","e":"AQAB","d":"YWrLDP16ATQ_39Bh51RbHb46ZPFMrfabxhgchgHqcBgpccFuU4kabu78n01EC6Hd6WXciVsB_a8FScoMwsw_36X3FwNblq6xUvDkNJ4DwdgIxEzvj6kXTD2mecYHyNKsR6Qda-a3SNquilZNJcHslpiJXNStH-_wTj7Cq1keulMHvzVHC9KAulJthmOA-weASYsr1dzA0R-ZhoQ4tvfnBkWAhUiMSzRIpeKELmFlUPelV1wXEtBKF7BHSwWmuzn8BuozBBgqOIduzfZ4xp5OEYRfCyU2lp_-J1xD87cdqwLNAsNw8sLEF_NROKd3NgO9vysvjOmVoHwx_uTIwRQXcQ","p":"_LsnXs3QsvwA7vHJg8xLNpNA8MkxRwPEkqSyXIvWt3mFOFmxnU64b9WPAUEZ9VMX0PBY8vYe4LMSgjvLZ1M2VoSadvP5R3KNWA3yapDVCZ9XLq6yVA-Xa-uPhoyITCe_5fAqMCMO9TeKdX74Z5hhRK8xcUBRA7fgXV4dFMcdpVk","q":"8w5-WDU3Hn_yCAQND9Xv7N8t6Ak9QG88QP-K8_SPoswwxQ7iXFs5XI6RByC2sPPL_QeK3R_rK9aoQH1ru9zfVyBG3JoMPAHVYzkORqyvdx8RHjgHMOb1agvIyTr1s50HMSw-o8LVJ_bodIMvbsYpapIvUAfJfGh9XyGopoFlVdc","dp":"htX_AkiCYQusH89l-OhE9IAJtK1SmhW7iZVPB6sfylGOLutDpK68HgZtPnkSNV24piOlATModC9133-xXJX7tpsWogI2a9UE7ga63_oXfwPBCsnvoIOVAOHzeBCAI0lNy4qfp4D82P1h5J_yPasBshhaI5bx4i73CDlPAKfe_Dk","dq":"XZIA1dh2xckf1jIpDSWhXiF1PNUBvaKVIbi_N7e47EWLqPFX95Iu_RDtiD7x1iGlMF4M-Z_mG1RiJaGjLgmT-ai1Xwv3Fcrm6XH3qwGj80oEfwu2yP7BD_hFbiLCoEkdkbKk0sqY4O_PAbvXMOAc5agtirPUv45CZbNBiAhciLU","qi":"oprzMWtWVuNuq-rPV8x8FpIlo2IkdUleRSmVbbJ7GU_rvcy3DHK4Mw7cyU_vlWWobJhM4VRT8rIUf0aZcZk4TcK11UGnKYk9_LDSeLh6trfAwjbltbCoEjh4FQM0SEKx7sWyxlE2HqG6rhOd2N8YCgIx9BznjyuQaPujuET1yEc"} \ No newline at end of file diff --git a/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/regr.json b/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/regr.json new file mode 100644 index 0000000..78da7db --- /dev/null +++ b/assets/letsencrypt/accounts/acme-staging.api.letsencrypt.org/directory/fb99b4ea99548fa3d7c3ed6bafe8e0ee/regr.json @@ -0,0 +1 @@ +{"body":{"id":446474,"key":{"kty":"RSA","n":"7_P1VlbLtqrK4VHFSWLJ3FErJQLVr-Jh5WyaqFes92ARB4DrbckoMIGUFnSgOfCjwFd_XzNc8OTxqX7_9cW9DWukpLSj7pZ2JhpzdB_U5OnUCGgG0Vn66dTdLJTXPeZSNZiAd4AuBncgwHomY_VwWwfNexuajndxqS-Coe2kkigAB_dYrHiPHPn6MP3a9pZrw0l_9TggOnE414eJgs0v_MP6Qpy1IJfYZoDTcYXeOsangGKSLiUJVXWXXy00plSdepr5HX_fncYu0QQ9fAx2MmYwZcx2LFmFpimcm2NDugtpt5vsxYf3m00aZ4jeg4RNn_dvX-EuPP-Eb3FKJulqvw","e":"AQAB"},"contact":["mailto:domains@lossless.org"],"agreement":"https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf","initialIp":"93.199.240.80","createdAt":"2016-10-24T00:06:01Z","Status":""}} \ No newline at end of file diff --git a/assets/letsencrypt/live/test.bleu.de/privkey.pem b/assets/letsencrypt/live/test.bleu.de/privkey.pem new file mode 100644 index 0000000..dd9d892 --- /dev/null +++ b/assets/letsencrypt/live/test.bleu.de/privkey.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAps/ccP/ZcG4c52QgrjfDJkYUSvYRIEq8zcaR+Jq8iaM+HNWk +zRzCYYh5qxbWzf/bIlo4rTOO9CePZNGyYG7WDy+NLAO2ygdqbHrIxC4cwSoFH3zO +HEPPm4BahMSMK5hcKb7xOH/6xLyXBr588W8VW8BexqnMGq0Z7hDWKvKMBcjQYgIf +FwEw/ykQ1+PZysmLNGAiQuSnlfaeVWaNKAz0tpB7fSQkfe9HNlGa8pRUDrrgg7pL +zpBVGmQwzPMNY2au6erVsGpWtEEqL164lKhXdoQMyvdjdGTfcB5+tBx49WpM1EQ2 +VKyn68OImYm1olH6NripDsAfUDASJ/+nd1ZdPQIDAQABAoIBACumRpu3BzHZTmzq +EXclFkakndjDrNWTWPZLmJTCAMXPVoh7CyW0+dRFvvibAFhlM/U4QI5p6GVRGL+b +854yQoc0vS8gRat15049jt1u541QLoj/wns471FUc9s8ByW9N5ig40QSkQ77/lUA +cXdHxwH8Q5Cei88LLrbR5wjT8PnuFwD20HTjhc6XEoESdIX6hX1WXOCjSTkDKb1f +h0vix3+HZ4NL9f1jRm5+kPZ5xTNtWgsiDn8RjyMBciogSG8lE5nA7IiRl16fQaZ7 +au3Pl/nVLk80uA3gtH6KjXlQDKrmqPFO78W5tjdfU+BImDCdbn9sQ1to6kAvgND+ +TJ122cECgYEA183Gc4kTd9gF32BnZbZW/iqBiUgado0dgADQj4hVmDWqur6J24re +sZP+uBxqN4r9deBoUsbl8cAzYeVG4q3NtDJgiWrKCnitKTxQRC6iDLN57bHbfyR6 ++15QjT9QoeizlFLd/cw2Bud0kTCxMQ+GleeoPiYdwJxNNPLZoqrele0CgYEAxeH+ +5FwdPlqFekiF9/ZOpGNVy1i+fXYdfgpnnUmUpeZZeVk0aYCQLTsvtXwX0INnOvNk +dYraFHbjcukCZb4/iODxT8mh6TKB6/6UcS+Dw9JLKRvmannZlX/459wLmQZOBKdR +dG3eksoJUt07dBb8yW7k5+QEd38ek3S5nhkC+pECgYBc3XYqvbAdAF72kxurj128 +HjqEAv0wSuWI8dDOE1MSHvYLSnc0fHv8Wr1gKQokQLF1ik4aYPEOqTDzTaDFZxmA +E7WrLMMo4mlRt1yrGo4tfQZZHRJhkidCCIINZlOieOreRxK0Zq5RJkTpPdTiUdYO +qBOkOu7OtfQbdu3krDcAuQKBgQCcxUPcBUJB0RNoYqaIYUHCqNQiqucXnIkW/wVB +rjavDIScR9jnMKyIuRg+DtcLId+Z65QOL3hAuEPQGNwGYSgSuCtVy+eTSal2nxVZ +aoxYinVzVyBAANMpxt4aStGBZWZP94Ln29d2scubM5xTh5azu0BsmtATH8nIhrQ7 +lZMvkQKBgAM2z2B0rRodhWcENk04KxBbcgRc8/Ae59cYARi0o29/Vh0vK1fBEdQd +2QqjRkh3yJE8Vl/7hqsf4U9KeVazlVwdLK1T8Kr9Uk+Z1Umuh4hxtdOI2gufHjzU +AIEk2EwKJbduVseMoQD0r8Y8eqOFeB+xvv0kZJ7CJxtHUve+RQuf +-----END RSA PRIVATE KEY----- diff --git a/dist/cert.classes.cert.js b/dist/cert.classes.cert.js index 257acdb..e292d1f 100644 --- a/dist/cert.classes.cert.js +++ b/dist/cert.classes.cert.js @@ -30,7 +30,6 @@ class Cert { gitOriginRepo: optionsArg.gitOriginRepo, certInstance: this }); - this._certRepo; } /** * adds a Certificate for a given domain @@ -66,4 +65,4 @@ class Cert { } } exports.Cert = Cert; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5jbGFzc2VzLmNlcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZXJ0LmNsYXNzZXMuY2VydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsdUJBQXNCO0FBQ3RCLDZCQUEwQztBQUsxQyxVQUFVO0FBQ1YseUVBQXdEO0FBQ3hELG1FQUFrRDtBQUNsRCx5RUFBZ0U7QUFDaEUsbUZBQWtFO0FBV2xFO0lBT0k7O09BRUc7SUFDSCxZQUFZLFVBQW1DO1FBVC9DLDJCQUFzQixHQUFHLElBQUksZUFBUyxFQUFFLENBQUE7UUFDeEMsbUJBQWMsR0FBRyxJQUFJLGVBQVMsRUFBZSxDQUFBO1FBVXpDLDBCQUEwQjtRQUMxQixJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxnREFBZ0IsQ0FBQztZQUMxQyxPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU87WUFDM0IsS0FBSyxFQUFFLFVBQVUsQ0FBQyxLQUFLO1NBQzFCLENBQUMsQ0FBQTtRQUVGLG9CQUFvQjtRQUNwQixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksc0NBQVcsQ0FBQztZQUMvQixLQUFLLEVBQUUsVUFBVSxDQUFDLEtBQUs7WUFDdkIsTUFBTSxFQUFFLFVBQVUsQ0FBQyxVQUFVO1lBQzdCLGdCQUFnQixFQUFFLElBQUksQ0FBQyxpQkFBaUI7U0FDM0MsQ0FBQyxDQUFBO1FBRUYsZ0JBQWdCO1FBQ2hCLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxnQ0FBUSxDQUFDO1lBQzFCLFVBQVUsRUFBRSxVQUFVLENBQUMsVUFBVTtZQUNqQyxhQUFhLEVBQUUsVUFBVSxDQUFDLGFBQWE7WUFDdkMsWUFBWSxFQUFFLElBQUk7U0FDckIsQ0FBQyxDQUFBO1FBRUYsSUFBSSxDQUFDLFNBQVMsQ0FBQTtJQUNsQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxjQUFjLENBQUMsYUFBcUIsRUFBRSxhQUFpQyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUU7UUFDbkYsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3BCLElBQUksb0JBQW9CLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXO1lBQzVELE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxLQUFLLGFBQWEsQ0FBQTtRQUNuRCxDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyxDQUFDLG9CQUFvQixZQUFZLHNDQUFXLENBQUMsQ0FBQyxDQUFDO1lBQzlDLG9CQUFvQixDQUFDLEtBQUssRUFBRTtpQkFDdkIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUMzQixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixvQkFBb0IsR0FBRyxJQUFJLHNDQUFXLENBQUM7Z0JBQ25DLFlBQVksRUFBRSxJQUFJO2dCQUNsQixVQUFVLEVBQUUsYUFBYTthQUM1QixDQUFDLENBQUE7WUFDRixvQkFBb0IsQ0FBQyxLQUFLLEVBQUU7aUJBQ3ZCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDM0IsQ0FBQztRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7T0FFRztJQUNILG9CQUFvQjtJQUVwQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNO0lBRU4sQ0FBQztDQUNKO0FBdEVELG9CQXNFQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5jbGFzc2VzLmNlcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZXJ0LmNsYXNzZXMuY2VydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsdUJBQXNCO0FBQ3RCLDZCQUEwQztBQUsxQyxVQUFVO0FBQ1YseUVBQXdEO0FBQ3hELG1FQUFrRDtBQUNsRCx5RUFBZ0U7QUFDaEUsbUZBQWtFO0FBV2xFO0lBT0k7O09BRUc7SUFDSCxZQUFZLFVBQW1DO1FBVC9DLDJCQUFzQixHQUFHLElBQUksZUFBUyxFQUFFLENBQUE7UUFDeEMsbUJBQWMsR0FBRyxJQUFJLGVBQVMsRUFBZSxDQUFBO1FBVXpDLDBCQUEwQjtRQUMxQixJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxnREFBZ0IsQ0FBQztZQUMxQyxPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU87WUFDM0IsS0FBSyxFQUFFLFVBQVUsQ0FBQyxLQUFLO1NBQzFCLENBQUMsQ0FBQTtRQUVGLG9CQUFvQjtRQUNwQixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksc0NBQVcsQ0FBQztZQUMvQixLQUFLLEVBQUUsVUFBVSxDQUFDLEtBQUs7WUFDdkIsTUFBTSxFQUFFLFVBQVUsQ0FBQyxVQUFVO1lBQzdCLGdCQUFnQixFQUFFLElBQUksQ0FBQyxpQkFBaUI7U0FDM0MsQ0FBQyxDQUFBO1FBRUYsZ0JBQWdCO1FBQ2hCLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxnQ0FBUSxDQUFDO1lBQzFCLFVBQVUsRUFBRSxVQUFVLENBQUMsVUFBVTtZQUNqQyxhQUFhLEVBQUUsVUFBVSxDQUFDLGFBQWE7WUFDdkMsWUFBWSxFQUFFLElBQUk7U0FDckIsQ0FBQyxDQUFBO0lBQ04sQ0FBQztJQUVEOztPQUVHO0lBQ0gsY0FBYyxDQUFDLGFBQXFCLEVBQUUsYUFBaUMsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFO1FBQ25GLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixJQUFJLG9CQUFvQixHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUMsV0FBVztZQUM1RCxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsS0FBSyxhQUFhLENBQUE7UUFDbkQsQ0FBQyxDQUFDLENBQUE7UUFDRixFQUFFLENBQUMsQ0FBQyxvQkFBb0IsWUFBWSxzQ0FBVyxDQUFDLENBQUMsQ0FBQztZQUM5QyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUU7aUJBQ3ZCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDM0IsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osb0JBQW9CLEdBQUcsSUFBSSxzQ0FBVyxDQUFDO2dCQUNuQyxZQUFZLEVBQUUsSUFBSTtnQkFDbEIsVUFBVSxFQUFFLGFBQWE7YUFDNUIsQ0FBQyxDQUFBO1lBQ0Ysb0JBQW9CLENBQUMsS0FBSyxFQUFFO2lCQUN2QixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzNCLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxvQkFBb0I7SUFFcEIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTTtJQUVOLENBQUM7Q0FDSjtBQXBFRCxvQkFvRUMifQ== \ No newline at end of file diff --git a/dist/cert.classes.letsencrypt.js b/dist/cert.classes.letsencrypt.js index 47cbd43..557f23c 100644 --- a/dist/cert.classes.letsencrypt.js +++ b/dist/cert.classes.letsencrypt.js @@ -19,7 +19,10 @@ class Letsencrypt { // create leInstance this._leInstance = letsencrypt.create({ server: this._leServerUrl, - challenges: { 'dns-01': this._leChallengeHandler() }, + challenges: { + 'http-01': this._leChallengeHandler(), + 'dns-01': this._leChallengeHandler(), + }, challengeType: 'dns-01', configDir: paths.leConfigDir, privkeyPath: ':configDir/live/:hostname/privkey.pem', @@ -29,7 +32,7 @@ class Letsencrypt { agreeToTerms: (opts, agreeCb) => { agreeCb(null, opts.tosUrl); }, - debug: false + debug: true }); } /** @@ -42,10 +45,11 @@ class Letsencrypt { console.log(this._leServerUrl); this._leInstance.register({ domains: [domainNameArg], - email: 'domains@lossless.org', + email: 'office@lossless.com', agreeTos: true, - rsaKeySize: 2048 - }).then((results) => { + rsaKeySize: 2048, + challengeType: 'dns-01' + }).then(results => { plugins.beautylog.success(`Got certificates for ${domainNameArg}`); this._leCopyToDestination(domainNameArg).then(done.resolve); }, (err) => { @@ -60,6 +64,7 @@ class Letsencrypt { // -------------------------------------------- _leCopyToDestination(domainNameArg) { let done = q.defer(); + done.resolve(); return done.promise; } /** @@ -69,7 +74,7 @@ class Letsencrypt { return { getOptions: () => { return { - debug: true + debug: false }; }, set: (args, domain, challenge, keyAuthorization, cb) => { @@ -85,7 +90,6 @@ class Letsencrypt { }); }, get: (defaults, domain, challenge, cb) => { - console.log(defaults); console.log(domain); console.log(challenge); cb(); @@ -96,7 +100,7 @@ class Letsencrypt { cb(); }); }, - loopback: (opts, domain, token, keyAuthorization, cb) => { + loopback: (defaults, domain, challenge, done) => { cb(); }, test: (defaults, domain, challenge, cb) => { @@ -106,4 +110,4 @@ class Letsencrypt { } } exports.Letsencrypt = Letsencrypt; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5jbGFzc2VzLmxldHNlbmNyeXB0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5jbGFzc2VzLmxldHNlbmNyeXB0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBc0I7QUFDdEIsSUFBSSxXQUFXLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRXhDLDBDQUF5QztBQUN6QyxzQ0FBcUM7QUFZckM7SUFRSSxZQUFZLFVBQTBDO1FBQ2xELGtCQUFrQjtRQUNsQixJQUFJLENBQUMsS0FBSyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUE7UUFDN0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQTtRQUNuRCxJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUE7UUFFL0IsOEJBQThCO1FBQzlCLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztZQUM5QixJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxtQkFBbUIsQ0FBQTtRQUN2RCxDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztZQUNsQyxJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQTtRQUNwRCxDQUFDO1FBRUQsb0JBQW9CO1FBQ3BCLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDLE1BQU0sQ0FBQztZQUNsQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDekIsVUFBVSxFQUFFLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxFQUFFO1lBQ3BELGFBQWEsRUFBRSxRQUFRO1lBQ3ZCLFNBQVMsRUFBRSxLQUFLLENBQUMsV0FBVztZQUM1QixXQUFXLEVBQUUsdUNBQXVDO1lBQ3BELGFBQWEsRUFBRSx5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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5jbGFzc2VzLmxldHNlbmNyeXB0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5jbGFzc2VzLmxldHNlbmNyeXB0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBc0I7QUFDdEIsSUFBSSxXQUFXLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRXhDLDBDQUF5QztBQUN6QyxzQ0FBcUM7QUFZckM7SUFRSSxZQUFZLFVBQTBDO1FBQ2xELGtCQUFrQjtRQUNsQixJQUFJLENBQUMsS0FBSyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUE7UUFDN0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQTtRQUNuRCxJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUE7UUFFL0IsOEJBQThCO1FBQzlCLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztZQUM5QixJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxtQkFBbUIsQ0FBQTtRQUN2RCxDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztZQUNsQyxJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQTtRQUNwRCxDQUFDO1FBRUQsb0JBQW9CO1FBQ3BCLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDLE1BQU0sQ0FBQztZQUNsQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDekIsVUFBVSxFQUFFO2dCQUNSLFNBQVMsRUFBRSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7Z0JBQ3JDLFFBQVEsRUFBRSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7YUFDdkM7WUFDRCxhQUFhLEVBQUUsUUFBUTtZQUN2QixTQUFTLEVBQUUsS0FBSyxDQUFDLFdBQVc7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 \ No newline at end of file diff --git a/ts/cert.classes.cert.ts b/ts/cert.classes.cert.ts index bfa367e..cf64bb2 100644 --- a/ts/cert.classes.cert.ts +++ b/ts/cert.classes.cert.ts @@ -50,8 +50,6 @@ export class Cert { gitOriginRepo: optionsArg.gitOriginRepo, certInstance: this }) - - this._certRepo } /** diff --git a/ts/cert.classes.letsencrypt.ts b/ts/cert.classes.letsencrypt.ts index 62b98f5..694c501 100644 --- a/ts/cert.classes.letsencrypt.ts +++ b/ts/cert.classes.letsencrypt.ts @@ -38,7 +38,9 @@ export class Letsencrypt { // create leInstance this._leInstance = letsencrypt.create({ server: this._leServerUrl, - challenges: { 'dns-01': this._leChallengeHandler() }, + challenges: { + 'dns-01': this._leChallengeHandler(), + }, challengeType: 'dns-01', configDir: paths.leConfigDir, privkeyPath: ':configDir/live/:hostname/privkey.pem', @@ -48,7 +50,7 @@ export class Letsencrypt { agreeToTerms: (opts, agreeCb) => { agreeCb(null, opts.tosUrl) }, - debug: false + debug: true }) } @@ -62,11 +64,12 @@ export class Letsencrypt { console.log(this._leServerUrl) this._leInstance.register({ domains: [domainNameArg], - email: 'domains@lossless.org', + email: 'office@lossless.com', agreeTos: true, - rsaKeySize: 2048 + rsaKeySize: 2048, + challengeType: 'dns-01' }).then( - (results) => { + results => { plugins.beautylog.success(`Got certificates for ${domainNameArg}`) this._leCopyToDestination(domainNameArg).then(done.resolve) }, @@ -85,6 +88,7 @@ export class Letsencrypt { private _leCopyToDestination(domainNameArg) { let done = q.defer() + done.resolve() return done.promise } @@ -95,7 +99,7 @@ export class Letsencrypt { return { getOptions: () => { return { - debug: true + debug: false } }, set: (args, domain, challenge, keyAuthorization, cb) => { @@ -111,7 +115,6 @@ export class Letsencrypt { }) }, get: (defaults, domain, challenge, cb) => { - console.log(defaults) console.log(domain) console.log(challenge) cb() @@ -122,7 +125,7 @@ export class Letsencrypt { cb() }) }, - loopback: (opts, domain, token, keyAuthorization, cb) => { + loopback: (defaults, domain, challenge, done) => { cb() }, test: (defaults, domain, challenge, cb) => {