leap cert should accept --force anywhere, fix bitmask.net key+cert

7 files changed, 226 insertions, 180 deletions

diff --git a/files/ca/lets-encrypt-account.json b/files/ca/lets-encrypt-account.json
index d7e90b5..66ad022 100644
--- a/files/ca/lets-encrypt-account.json
+++ b/files/ca/lets-encrypt-account.json
@@ -2,11 +2,11 @@
   "contact": [
     "mailto:sysdev@leap.se"
   ],
-  "id": 3825914,
+  "id": 5121799,
   "key": {
     "e": "AQAB",
     "kty": "RSA",
-    "n": "x2XSRQoxXHzTaslZMjQIeMN14BaratKb4M1Bm1dkQUMEB9DEFqzbctTgjM8o9zBJkNcs800B--dGlfPmr_YFszZzXiA8MiHZKKrJHKuHsNDJ_CKi6IilqM4ZUI34BZGHaSF7HXuVQeUYJoAcw8DoT2vAfYSPED3ksUeNtEOOIN_nDAkS8RufQTfD3VpaU984KLOMiSy3As48_unFW6bilEemQo7XG7Dn6uIqDL5qhhOw0rKmF-q2sfk8f-_kABnitP_JRUhIKH3-oJabmeo8PMKGjCo39p5fWPoBc3gV5sWzxQSIIFJzUzBq-I7Xim-OvOKpEgC_HgPPSCgVZUJgZS1JOFJmit9xEO0krHi0X2Z6qq8HdaPzFTw05-vtWPHKl9aO6jI7ySjLKZ1XJIgeGiarx9ClvfsFh_7Bqfk0AGF2fQWpGNcvZ3SzTnE0paOXukFsGpD_5bLUtT7Or5dOn_WQE55ehpZPNaQdI3df3DMt5R4LSCMm9ZKBRIz1wWyIPy6qVkTkdLji_1SgH6851DxDnGJzB08i2cqoV2gWrtzaIV1TjCeam5FXnJgGHQwDHr5ydc1UUcljo0HgcDEg4WmWhbbkvDOZcXHDQR5WYOzpuz-Xm6Y6u09xui09wkmwYYMldxNTqnGoo6qJh3-b4XZKbva5hmD6LimljvyyOP8"
+    "n": "pIWxiR6KeVdATXoxA5B2MdfQKpqGiP6fa65F1LQmpo9_mAhqy9WxP8MvvTHMAxldZi1jAy79OkP_gg8f0Gctu3a-HoHwMI1sASf_9W5qEXceo5A8Mz1qWBZe6Pzeeq9md8ZEZDL409xmYq_gfPgoqyZeHWIYgHqmcFydz4COWK_EXVjjEo5N6CbkAAX7ztq2fG1QF9T0s9GVt5Sm70wVCmKMFKdkfQKGq0GK5VxOKh6MBrM9hWXYknPCSvJVIIqhD5jfsMsvZaUB8b4TboO5-H_w0kDPVTkd3TxR96noVjQflNNO5nSUXTOxpvQ5JTcQADUM5okAIMCz3JroxQP8S11DauexRufY0hLnfNQ2vIYTPdh7k44GvtzWXBkbhH5OkCzFHXd01DvD7oIgf2RrmljaE7E8kkKpjlyIYypCqMBhRaTHVPOeBYpfxVBtdOn6MNA1YbLaBfYk_jUDg8mNLCf5j1phy0oRF8N2A-w2lkGfK0JoRDarREWTduNUN4KP8LGwmZvIjnkOF0vHjq5ypyljoX3yyN7q-uxnXmg5KIlp7qmON5h71qFPzqg1fXArxsOANPVoHpyyH6_0MCX6inGb5_J76-cX8Zeu-GgfgkE1GjtmdLmpr801YUDlULXcuWOm8Qld9CjptNTNn8kSm9A5COsnWaz58rZd4OKYYq8"
   },
-  "uri": "https://acme-v01.api.letsencrypt.org/acme/reg/3825914"
+  "uri": "https://acme-v01.api.letsencrypt.org/acme/reg/5121799"
 }
\ No newline at end of file
diff --git a/files/ca/lets-encrypt-account.key b/files/ca/lets-encrypt-account.key
index c6b0bc9..aa34ff2 100644
--- a/files/ca/lets-encrypt-account.key
+++ b/files/ca/lets-encrypt-account.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/files/cert/bitmask.net.crt b/files/cert/bitmask.net.crt
index 71ad327..84362b7 100644
--- a/files/cert/bitmask.net.crt
+++ b/files/cert/bitmask.net.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
@@ -25,12 +25,12 @@ FhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtU
 aGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlp
 bmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRp
 ZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9y
-ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAGKHEAnfeSOAaKmbVx3UlA2cO
-Prvw1pnaTOkL0IvxkO+gFtB3yjA5Xd5NzQ6nW++5yL5XiTCXcBJ9TKUHbnHFei1u
-whfU41GakMcHBkjrEl9NEYTVFjMxIZGXP3JGlJfEXM4tbsVbPT9+e8gBYZHsOcCY
-Rv8k79U2YNpeb0lM3wwGZi8TyX8JE7ZLXZ0kQl0Dkkv4hP/nxrBFRFKrwbpIPL6a
-o+bH7RBfaGBYVbH4iBzoWvJgT0rV2rbqplwonVPGDq7ZEVWmRn593bOJwioVGzax
-ImVBFvs4klzKbeFUJ5IRgZwhXWLcOx7g6b+cmHe8G6PCVPNaEv60JJyBqcVrmg==
+ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAAyJ8Y8dchaD9G+xkATla3UIb
+c+4kV4Pls0O+ezBC3/KwWEi5UfBKZ4TxAClDx1m3Og6P8ZtJnOzt22ErA4R2kqMZ
+//ZgUkYJOb6Q7NalPxvnvAmO0hBX5mZ9CtCNT8ziJg3CNmQiHmV2VM/el0d/7U+B
+iuAU0Gll9zt3sxgtTrTY3DSqKxFuOydzONWjfhFxVJe0h4HFYy3z0HuSLIhY0Ahz
+h03BNbhSRpQcG0TwKPU1X3YG+A/Y6bNO9NcI2/ohSIVsKW6IFJ2revYy9v1ShXbA
+OU3K1d5og111oHwFpwRFbZeb/MKFCu+WYxnXALpTt7easetu2o2chIf4ggNVYQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/bitmask.net.csr b/files/cert/bitmask.net.csr
index 131310d..b9153b6 100644
--- a/files/cert/bitmask.net.csr
+++ b/files/cert/bitmask.net.csr
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-ay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCXFIEj7T1Ego4b
-iEtoMKlNv0LpMoBKGRX90sEel5m2I/BpBIlzZu/ad0+JAuQxHh6UU6w9yqy4q+/D
-y8VwvwCCoUQd/nUqCiPGjHwTgb8NI0vxOwBgPtI3aPi4mh3fSWYFjZdRS4L4iL2I
-sWiUyAPfuemSBbtLPU6PVQxLC4sVwTBrwUPqiU5E6wUbBBLXNxLT1+amHkzrec4+
-nsKMJSAWC/MgKsQTtLcmL1QYTVt8JzGhCyvaK7kYIldOiQXVEKpFKEQkbI4KhDK8
-dgIf5zHFIJhUdwvF560BlWiS5F6eBSgiBzBa8wztuHxMg3RIQi8lxFKQtj9MBF2P
-QtZtvcrjYJN93gNPORjU919/RVnU+fG9B7FGdxXXq9eOC2+Ibpx2oeaWxPhi70yk
-go1jmR4wPtD9GyI4Rs6kDxPerAfoZJpgFLmr7kzOWLA2mHGobjfXwVIfQXwpZmxW
-+EaeKgKbXCh3NpkLWxd7l7zm/8twbDJQUNNXUtFkdyU22gUPWGxeZLsEaHnkCK49
-RAyqTKDIJuy/u7f9mV52b1yOuLlJ3kZw4v0G+jxdOoEdVBQUokpF6K0CFfkzud6W
-zRJHway9Oqc6YExuJsz8kXhYR2CraQHpJaGlm9aaXFA8+30pNkhHXYpwRy6DFj8D
-B2fitNsnF1m9/KpsUABmdgVsUWWIiQIDAQABoD4wPAYJKoZIhvcNAQkOMS8wLTAJ
+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
-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
+hkiG9w0BAQsFAAOCAgEAZ0kceATCXEgajIClC2SdHHCNOJIe67ypNwuPgkGGfkbj
+TIFOSUOLH8COsMJFZAYErCkM84/s+/waMP9NP1rsnxav8mvhoBBm1rsAjG6Ac6I5
+OfeoLfu44ipxQ3pWxFZw1NjCZjMBWSyOlPGU8iCCiXbKIwItQ4Lx4EhCri0StmSK
+ZKP9PCglS+I0bNJWP5AMjUPcl4j30bxBcPKhR1e3cqaE+JL2o3Nm99w25PWR/ruy
+/Mj5Z83OdKJumu+/Z3F8L3cA1dqSeG2w77MEfkAQpSqOCYDlMsIoCl1HUkrlfnep
+ZQl6MB/9gLjo58f2MZ0K3psuONqmDXZxmu5MY/21mAcqIhCe3XFBpZkc/8kxh9K+
+X4m9rU7ct3Po8XdR6wYZfmkHoa17EpzzTNUNJ3G/PxhgA1doiEMm5fOfq6qx5y9v
+bNF2qg7koKQUKO2IJDtzzmdWHo8C3EjI+211HmiorTg9loqa21pZyWghWYX0r2lR
+8Ghbq1IuDHZEiTdoOYgwpiytRFLBfixUBD7FNqAANpd9DUQ86kAPF+AQ/I4BjcJM
+hgykotXkTAoUHP78uslGNJgENTzR3fHEbt17QUQ7y3jk47XTNVeeRtIsWqramZLF
+FroqNMIDJiC41F0Si505RKLHJfEbRtyZdV7PDjZvvQRLpdJe9gZFIPbXU56t71w=
 -----END CERTIFICATE REQUEST-----
diff --git a/files/cert/bitmask.net.key b/files/cert/bitmask.net.key
index 47bbd9a..f47902c 100644
--- a/files/cert/bitmask.net.key
+++ b/files/cert/bitmask.net.key
@@ -1,28 +1,51 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyX/U1q+7ZYf9v
-34BIyJ2jYZRTVVtjyB9TVX1bGQxDXaXgeErCeq/G+w4LjIWb9Y/cYGxiFsmnNIxP
-NA8xDID8LmDpfV0soJ3mAesKKxpodDHJgU8e8VdAMNRl/K3qESqgbgxsd7UTb2Hf
-E3oMKLwpjCT6jNyxCL1wYQdWJHh1MOkzSIK/M0NkXDCAj02PaUKnmy1oFIVp9Irm
-JTM/g+Ba0ayqi3b/Nm2/z5GfAOrAMtJfPknxupPFv3LR7jj5d2AIcHUTNFNIZu+X
-g+qUgp0G9GygC5kYvmsmL84U4dAwzRKb0Crr/Cb6accaTtIyVcUB9E4OIwABizqi
-Nw7EWqUtAgMBAAECggEBAJ1V9MV9vXVzcktsmgwZIKrvNFT5El6GM9Nese67vkxh
-eyHvGQpIC2n5Il9feK6jQFzDlHZE4WQh/q0SH2BFRjSqeAMb+CaYGg66nGZgtK9z
-5kJ2U6LYf/x31bGL2p9+utm9mCnIwSi+c1bAKEQ3XhlLq4Zw320sZ2SLwVvjWXkL
-zMZBDywzxxoQucshN+ixgRY3h5UIjYq2WmByme3plI35taJrnjMDQkvLv4T4RZEV
-R4ffB5GYrxh3UAXP+tl9za8SELyQKcup0op8tvUAQTVxvTZ9o58WUQRBVnXPQwVA
-1WIjL+K8ng+8uv6eWPXWUiKpvLS0UdGs3SKESKGu7aECgYEA4zjBo8mDHx7DMBbY
-nHkHhRExTTR8MBycQ/qSn6IYibvr0Yob6jAY/IKWqMofbMUlKRmS4xP+TUk227mB
-U1uY6/qfcWIUOatHeHMWlZUfoDbqEghwHVcIepLziIR9SWPaj0N1waf+G4/uVWYk
-nB7m7hqdGro+8i0BD/V5RJsMFJUCgYEAyPdumcfPB4JfArmrsg7DTVNYXuY2+nH7
-hohQ539y/SGFRqDxEqrbSsJo/jofU0ZZECVuieE4NqmkCBohXq+nzNHpsOgXveiW
-NOdFuurDFxM+XTH240U1Ea9J4cHy+/fkM6CWvIyB3pkAGhjYkrqRoC0M+OeSxT4C
-zz3d6eDt0DkCgYEAz7rUtTOGT44lLjLEx5CSgmHsa8PfAXE2n6NWJuDfhBQsjH2x
-9ZERVtDggeF/h0ZZKdD6i+V8aRXVNF3M0PN9w8d1uwfKq8pd5c15yTjzF9r8dY4H
-SZuG4eC1Cortq4nBh5ZJ8sjttC8K2kIumBhcUTQ9ivDYmTjxrrBhtIn3Kl0CgYA2
-L/ljf6vEA5QowPWZuj9Q70Mpu3thhjBi8wiVkxjnRg2QoL6/4M/mVYtH2VYu9w32
-u5EVnmOw4Yb4JEuRI13kbUlMyRf1vewaca2sm7Zk12x+ZoWCfFu13ATY2Znx9MJU
-ZV2fk2dFJQ4Q+1gSIDo57UvNJWu+wVyykqTudhbJiQKBgHQirMK38iLWMtebQIw9
-7h+SIC3s9NjGG4zL+ZdwxINwY12CX1P9DclMc0eLwRaTLhunN41HmlXBChLxwMBy
-ySEOGJYFGdpynhI/QUs/FGmqBCVvOou8eRWWByhRJQAJSj1t39SpxjaLKHPP/GsK
-yu9ryqb/TXaDn8Nj1DpCOJvV
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index f029f4f..cb041e7 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -159,24 +159,24 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          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
+          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
-          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
+          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
@@ -185,12 +185,12 @@ static:
           aGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlp
           bmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRp
           ZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9y
-          ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAGKHEAnfeSOAaKmbVx3UlA2cO
-          Prvw1pnaTOkL0IvxkO+gFtB3yjA5Xd5NzQ6nW++5yL5XiTCXcBJ9TKUHbnHFei1u
-          whfU41GakMcHBkjrEl9NEYTVFjMxIZGXP3JGlJfEXM4tbsVbPT9+e8gBYZHsOcCY
-          Rv8k79U2YNpeb0lM3wwGZi8TyX8JE7ZLXZ0kQl0Dkkv4hP/nxrBFRFKrwbpIPL6a
-          o+bH7RBfaGBYVbH4iBzoWvJgT0rV2rbqplwonVPGDq7ZEVWmRn593bOJwioVGzax
-          ImVBFvs4klzKbeFUJ5IRgZwhXWLcOx7g6b+cmHe8G6PCVPNaEv60JJyBqcVrmg==
+          ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAAyJ8Y8dchaD9G+xkATla3UIb
+          c+4kV4Pls0O+ezBC3/KwWEi5UfBKZ4TxAClDx1m3Og6P8ZtJnOzt22ErA4R2kqMZ
+          //ZgUkYJOb6Q7NalPxvnvAmO0hBX5mZ9CtCNT8ziJg3CNmQiHmV2VM/el0d/7U+B
+          iuAU0Gll9zt3sxgtTrTY3DSqKxFuOydzONWjfhFxVJe0h4HFYy3z0HuSLIhY0Ahz
+          h03BNbhSRpQcG0TwKPU1X3YG+A/Y6bNO9NcI2/ohSIVsKW6IFJ2revYy9v1ShXbA
+          OU3K1d5og111oHwFpwRFbZeb/MKFCu+WYxnXALpTt7easetu2o2chIf4ggNVYQ==
           -----END CERTIFICATE-----
           -----BEGIN CERTIFICATE-----
           MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
@@ -220,34 +220,57 @@ static:
           KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
           -----END CERTIFICATE-----
       key: |
-          -----BEGIN PRIVATE KEY-----
-          MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyX/U1q+7ZYf9v
-          34BIyJ2jYZRTVVtjyB9TVX1bGQxDXaXgeErCeq/G+w4LjIWb9Y/cYGxiFsmnNIxP
-          NA8xDID8LmDpfV0soJ3mAesKKxpodDHJgU8e8VdAMNRl/K3qESqgbgxsd7UTb2Hf
-          E3oMKLwpjCT6jNyxCL1wYQdWJHh1MOkzSIK/M0NkXDCAj02PaUKnmy1oFIVp9Irm
-          JTM/g+Ba0ayqi3b/Nm2/z5GfAOrAMtJfPknxupPFv3LR7jj5d2AIcHUTNFNIZu+X
-          g+qUgp0G9GygC5kYvmsmL84U4dAwzRKb0Crr/Cb6accaTtIyVcUB9E4OIwABizqi
-          Nw7EWqUtAgMBAAECggEBAJ1V9MV9vXVzcktsmgwZIKrvNFT5El6GM9Nese67vkxh
-          eyHvGQpIC2n5Il9feK6jQFzDlHZE4WQh/q0SH2BFRjSqeAMb+CaYGg66nGZgtK9z
-          5kJ2U6LYf/x31bGL2p9+utm9mCnIwSi+c1bAKEQ3XhlLq4Zw320sZ2SLwVvjWXkL
-          zMZBDywzxxoQucshN+ixgRY3h5UIjYq2WmByme3plI35taJrnjMDQkvLv4T4RZEV
-          R4ffB5GYrxh3UAXP+tl9za8SELyQKcup0op8tvUAQTVxvTZ9o58WUQRBVnXPQwVA
-          1WIjL+K8ng+8uv6eWPXWUiKpvLS0UdGs3SKESKGu7aECgYEA4zjBo8mDHx7DMBbY
-          nHkHhRExTTR8MBycQ/qSn6IYibvr0Yob6jAY/IKWqMofbMUlKRmS4xP+TUk227mB
-          U1uY6/qfcWIUOatHeHMWlZUfoDbqEghwHVcIepLziIR9SWPaj0N1waf+G4/uVWYk
-          nB7m7hqdGro+8i0BD/V5RJsMFJUCgYEAyPdumcfPB4JfArmrsg7DTVNYXuY2+nH7
-          hohQ539y/SGFRqDxEqrbSsJo/jofU0ZZECVuieE4NqmkCBohXq+nzNHpsOgXveiW
-          NOdFuurDFxM+XTH240U1Ea9J4cHy+/fkM6CWvIyB3pkAGhjYkrqRoC0M+OeSxT4C
-          zz3d6eDt0DkCgYEAz7rUtTOGT44lLjLEx5CSgmHsa8PfAXE2n6NWJuDfhBQsjH2x
-          9ZERVtDggeF/h0ZZKdD6i+V8aRXVNF3M0PN9w8d1uwfKq8pd5c15yTjzF9r8dY4H
-          SZuG4eC1Cortq4nBh5ZJ8sjttC8K2kIumBhcUTQ9ivDYmTjxrrBhtIn3Kl0CgYA2
-          L/ljf6vEA5QowPWZuj9Q70Mpu3thhjBi8wiVkxjnRg2QoL6/4M/mVYtH2VYu9w32
-          u5EVnmOw4Yb4JEuRI13kbUlMyRf1vewaca2sm7Zk12x+ZoWCfFu13ATY2Znx9MJU
-          ZV2fk2dFJQ4Q+1gSIDo57UvNJWu+wVyykqTudhbJiQKBgHQirMK38iLWMtebQIw9
-          7h+SIC3s9NjGG4zL+ZdwxINwY12CX1P9DclMc0eLwRaTLhunN41HmlXBChLxwMBy
-          ySEOGJYFGdpynhI/QUs/FGmqBCVvOou8eRWWByhRJQAJSj1t39SpxjaLKHPP/GsK
-          yu9ryqb/TXaDn8Nj1DpCOJvV
-          -----END PRIVATE KEY-----
+          -----BEGIN RSA PRIVATE KEY-----
+          MIIJKAIBAAKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/IR1fuHhHkp98J
+          9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/0CkmEF/ybcNP
+          3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelpcHL+9L10+yOc
+          5KwsmV5kCohCjUSmofWtRLG4dWgu8cxykCv1bcBvwhkXCMTNsPZdysmqOkgcS4dy
+          edRixY/dcTmDoKwI12LUpKnL6sC9ZhJDC9dTnAes4hb+QH2cZYAQQfmLQvK0/Vel
+          4O6C8Omldx3SS2UtDiJhJV8y4zjVs8bZ6cn3UPuoUxIS1D/OSCbq7dHcTNOBmgLh
+          3c7T7X1BlBBpZpitUqJ03ETAmBeC29jqyp0luUI9696yNi1dh3oV4BvDLopG2cLl
+          iNfg7f2pJxyqI+NR0ZyM4WxuAlHFS8JNEmKySiJ5ZHNsJXFQMbuYy1w5Vnlq3mgM
+          Y1JrdQB7Y2793v9HbFmp1y5XEsSvVHQ5qth4SrqreAdliGm7vq3+fuLfofwcOBr/
+          WzEANRS88S71+hZND9ovRHkQe/IbxuEiE9O8arZfaIUmYB6d7Bq+l3Gf26ZIc0Ry
+          9FuD41qXpEpbJzOOmLgq1dtFDWINTw5wddsMfybu/kCQCzK/vNHKfgQNYbkCAwEA
+          AQKCAgBMQ14mDvmL7Bq4r32a+SQ0BGKds2EU0gMBl2DSGEjeAZLxRvm3ReD66tdO
+          xMIDP5o9GLUmyJVwr9cBu2szt1GThMfrQPFR3lTlruY9WMjHP2n0wZCKO2GaY7G1
+          OB2j9g3OIPOEPEeQrCsp1qmMKsiarshUcBD/3E7WdwIMMS6ASbptDLemQCiToRlq
+          tKVWqbYABcBBcXMIaFSYfThHGMYknxHyuAgCY8OIya7CrMssb2f2bGQAxDQZ1B6F
+          Avs4z6HBl15Mdi2U1QoK5Rj5xHNviwnxUTVSTAwXF5HM/lV2HvlwDjAOxUZjmEs2
+          jCf5QsunFrkIDm8MZea/NhgXOFCuFM6cztzy9dlheSkRjugRF0EnIwyyquySuKrK
+          UDgtIFjiuLuJCfXfchlXdV5TvBdtAPeSsBglq5bHN67Zcf3rSOLRFdSH2FrynJus
+          wPgleiuHqe8Vf1nzpYqfOtV/o3vYhXvuv7wI9PkwZanm7RnG8wtd9oAv2ITFiRFT
+          knKSip7tH7ql4jgKz4B7DGhofGPAKsSjVBwnlQ1iwcDoxSHPBzNoihwCyeDsrx7x
+          OGRl5uF0Y21uAwzdS3Xel4zV59LvEYl/bse3J79PfiItj2KlV8A19hVI02fzPntG
+          6ap0XJjZ7DOM08i9ETddfi3717YBBDOMRKW9C5LmgHauvXCPFQKCAQEA24t+5/wO
+          13Y+zSUc/xLPhHY+fY7Bs32YE8xzTe9vfeWUvVBMMyg4aq5euvm8gnikVVSeJDso
+          VvjuZ7z12zz08u82Tl02N68FRyO9jwrQzxEyulITzqINNkOcNyDly2BT7BI/kC0M
+          t7NjbIAU1rhdBwEMQPJSlZ7wxH0VUUVuk/qtVGGh4Ts4E3Czstgud4s1exAnmhhE
+          ZnblhFe9wj9K2RADBiV8vYNdgGjdNMUxe9IHNRQqqtH20+ka5y/rSsK7HZb0bcPH
+          FHOoklIgTlryIS+fxAnUCFoq6wJXDkyU6A+5lLlPnkWY9KcLXz4etQ/pkGGKEXe1
+          XGx3DXv1VltGjwKCAQEAw5AsmzDuHmvaA21CtJY0kC7BPKtPGiZTTiT/Z0TSlSqX
+          BvXvvlAXYRdO2h1EwI/zf0Sn8CofB2n+i4wp7MHL4sx+KLntED1/ZkbLXZhCa3YU
+          YMjOVZDC+FpK4N8zbdvwet0jf7iOxemgO1YTvltolNUAkT4SsKWaGRv6q/UqB0da
+          iLl1Kapx1ZREx6OkCrYvpF07KwgvXCCf485v6gwNj46Ktr99LOLmGL4l+Jz8FTLj
+          1iHiJRW0Vgz+hGAM4sENB5Wq9I8JO91aRrgdRQcBDdDQ56E4yL2UeR0uD5K3T2TN
+          3OVN7QaYOTxAbIgdUi0zAzB+dwNcQpS2gMSj8W+3NwKCAQBrSdljzycFnnCEWj24
+          XV3yMsLJIyl/6MGX81Lp5DfNA5PTjFkgqugfIkWDBCZecEyGsspxlENbdV00bwCK
+          +lgOHF6inySuw6ZFpK6vJ67xcksjCJdLZKAmQ5Ykzrvdzp5UgHp1n75WS6Er1c/Z
+          OtGjaZyuZH19RuYMb8AqLk8im992nBu68PCvd2Up4kGbA/nHwRZJVNCgbjwtl59R
+          PRL7zrpbl5hFGNxps1Vew3syMmp5Qviy79a6qnEOR7mpmE5O4IVk2scANKFNmDrX
+          b9Rh6V8fM1peFopgvI0EnOIsIfskNgc1pndgH/4LtlTVUQhoGXKapLCJkSwA9/Hm
+          GMb7AoIBACULJEfpRtGgYFWR1rbaVO6SzKuvT3aGl/UPcQmgsbrrrFv3LgiAp00O
+          2zLZpHJNUjRjTuRhNitzWnIYhMCCHRrC3YrdXRhcbctz0YXTF5G/djC3GM6Ac04T
+          3GcoIFfI945uYREKZpD6pg1XSroeGntGtarNdUDcvYnQEPWNpP5n97A6YQUZciKg
+          yT5/ss0MoY2i01hdXos26tJ+Ahj1W4Q73e6r6wwblrZNHmgvZFinoRyoomuf5t79
+          6yAsCYTSSKONKCrXBUq/rSAENBclMn/pdAjMMzNjJcKjUlxE0FBLqesTzGT/gMom
+          rZVhWxx7z1PlVa85hbpe7QsLNHrBTJUCggEBAKkP56cYcwadwgV3LOfuKgDfBz8H
+          XMy6QI5Dvvm2M/wxjUMkFJ/jNZZKFqYYTBn7GjzEmy+wkeN++2iv9XE+O1t5qkj2
+          uxJ5GCKevilS3e7Vz+yYbvDPhFClRwSuoKAk/rU5ldJWYSm/8WNYuRI/ilPuu1Uv
+          FAX9fIqA4K/zY6zghLNc4+5AOy6S4vCq5WnScUmmTeQxobSUYHK3OQryVnSUeXN7
+          Fe9uLf62FTK4gETYouxRcPG68Q3Ph9Bt9v4qN9UvMufisGkSyqjtftt00cExqV/w
+          6m/kp4t2HJ/BcOxHQe/DXiTsA+qpCzvONzHa4P97hKxVF+tapjlqVJ2YFKo=
+          -----END RSA PRIVATE KEY-----
       locations: 
         front: 
           format: amber
diff --git a/nodes/diplocaulus.json b/nodes/diplocaulus.json
index 3fc91c4..bed0b92 100644
--- a/nodes/diplocaulus.json
+++ b/nodes/diplocaulus.json
@@ -20,9 +20,9 @@
             }
           }
         },
-        "cert": "= file('cert/bitmask.net.crt')",
-        "key": "= file('cert/bitmask.net.key')",
-        "ca_cert": "= file('cert/lets_encrypt_ca.crt')"
+	"ca_cert": "= file('cert/lets_encrypt_ca.crt')",
+	"key": "= file('cert/bitmask.net.key')",
+	"cert": "= file('cert/bitmask.net.crt')"
       }
     }
   },