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

1 files changed, 74 insertions, 51 deletions

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-----
-          MIIF+jCCBOKgAwIBAgISAyhIp64zz1JGh8//IJ3MjiZCMA0GCSqGSIb3DQEBCwUA
+          MIIF+jCCBOKgAwIBAgISA8851I1UtMRfxovk8CIPxUFZMA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          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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-----
+          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
+          -----END RSA PRIVATE KEY-----
       locations: 
         front: 
           format: amber