renew certs and remove old tags and ca files for the commercial CAs we don't use anymore

10 files changed, 61 insertions, 159 deletions

diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 1de7f78..4579809 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -604,10 +604,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGBDCCBOygAwIBAgISA5KdMHx2thFjHPTH2UOZOTBiMA0GCSqGSIb3DQEBCwUA
+      MIIGBDCCBOygAwIBAgISA2jV0em8V7f1Bm0bvw1GeoQdMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzAyMTUwODI1MDBaFw0x
-      NzA1MTYwODI1MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x
+      NzA3MjYxOTM0MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw
       vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z
       UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg
@@ -630,13 +630,13 @@ x509:
       BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
       biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
       IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
-      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAAoYHBYpFGUB
-      JKig80XKxWHAiO+pVeC9PkROD8nXshqz36yHknfm9BsRb5FMv/ey4FBRfLEFvFsV
-      v9Wmv1ahHCRt0mJ+WapjNHHeih1QPD8byPn6+DwZHxPn25a8c3bX/JBj1to6VWJf
-      jZnYRazH2O+hzsRtc2nOOFlU4G4sqozZ1Kz+sMeza/Y96aZit0NaRQB+hduxhg6c
-      Vesw/fB56UxOO0K7PPaI/LvPvRyfvWTrW7ynJO1mtXIdgYMB3tODRoJkP+5xEVnH
-      FnNE+rZHMuwdJOMvknh2GDGvIdfrYG+psqPcdwgS4udG+qFKHyEUvIZaoAkDz9Hu
-      zf58kwW+A/0=
+      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAJT6QTaabR4u
+      UgBsKhUYwshrDRaYmvVzBRJ9ICaN257Vhu2LW34EUxoBdjhxqsTe7yNbhJ2ql/w8
+      KWWZeamntEqr0ySR9Eqtem8Mwk7H2Vfll0A8G2z2G+HOeTFXF4nPPTIGCEszpADo
+      tS8QxiQ2GM/0J7HRMXFzhcwIzPjPp3Aj+B5u+4i+pX1jBRgpZaHbwIu9yWBg3J/m
+      XRffzuWOxb19EnXrLVbR46j1GFOa8VfqHUSnUE8EpNk6v4BLfGiaBzCzO7ke9D+Y
+      haZuuleKBTU7iKIK1DHRp7fEYaaSjL2LcHzk1IIUS1FbbjYILtMJNrZvwwGmjost
+      sul+NBr5itY=
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index cc70b20..5cccd41 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -189,7 +189,6 @@ stunnel:
   servers: {}
 tags: 
   - dc
-  - letsencrypt
   - unstable
 testing: 
   api_hosts: 
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index cd42d2d..bc1b183 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -119,7 +119,6 @@ stunnel:
   clients: {}
   servers: {}
 tags: 
-  - demovpn
   - development
   - seattle
 x509: 
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index 6f62f60..ce58d3e 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -163,10 +163,10 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIF+jCCBOKgAwIBAgISAyK6IkKBbrCMeuZ9d8KHPKkNMA0GCSqGSIb3DQEBCwUA
+          MIIF+jCCBOKgAwIBAgISA6ztS25e4M1FLJqqHObyohSpMA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzAzMjIxOTMxMDBaFw0x
-          NzA2MjAxOTMxMDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x
+          NzA3MjYxOTM0MDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
           9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
           R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
           0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -189,12 +189,12 @@ static:
           aGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlp
           bmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRp
           ZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9y
-          ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAJh/SCxXdMubmxXJxL3J4Ep9W
-          WBqyMlmT4zUQiXiDZfvRTz4/UaWubll74zuAw0DC4FDu+ZWbpVQwje03HMFuQIhG
-          VU8fvR+35DeXQb6nZ1CY2DYTA/6rU5L2kexHXEHnoASYmkgyd7KLfUq4RpPNC+D7
-          pxMlBMY/gvCr7neNMID1A8+TFmm18LSkW7CMOZSIZdiis7IP1lahVeWOxdRiiiRn
-          5C7bvKvdT/fDhNetnXossRXdvz3Hu5ac//73fn/mhEGobK5Jxg/l4An8E2CD+6aC
-          rFOdFVcHD2vBr0DteWFatvB6NAkDN3soRrhyJmY+uHZlikFsuslw+0ag874s9w==
+          ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAUbF7GeZrf4HASEECSuIZ6odl
+          y9noGuvAsRYIUwavN/aUxYD4iHhfmxE2OFiEl9eYnPrHKNh4h9EnJ7ewVL2Xx8YW
+          vI06E/5GO82NrS1G251xW1ZebkBPKVoSHNzRhlCDgjvqza0y23ik3NCibh6OX+tv
+          uozHfkbLfvZ6m88gZ3J82UrtIAEEr4t3/RCatMY7b0mW17HPJwWogRepF1zyfwZs
+          eVBRrngAcjqQGO8Ytx/RIo771lDjAmQSJF03jHadj/w1vbTB/h/Bm/M2EyRB/fpm
+          RyiXawmrxwvz2ZV+Rpt0pXP3XoT188jREbtn832EfTw6pMcWJuDJL+qk1ZWN2A==
           -----END CERTIFICATE-----
           -----BEGIN CERTIFICATE-----
           MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index e5730d7..c83e738 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -664,7 +664,6 @@ stunnel:
   servers: {}
 tags: 
   - dc
-  - letsencrypt
   - sandbox-braintree
   - unstable
 webapp: 
@@ -936,40 +935,13 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
+  commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGDDCCBPSgAwIBAgISA7FpWlKfBN3GQz1xzdmcdfDOMA0GCSqGSIb3DQEBCwUA
+      MIIGDDCCBPSgAwIBAgISA1pNyGFDfWcNWBkf9ArF0bo3MA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MTAxMTIwMDBaFw0x
-      NzA3MDkxMTIwMDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTMyMDBaFw0x
+      NzA3MjYxOTMyMDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
       IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
       /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
       IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
@@ -993,12 +965,12 @@ x509:
       bGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRh
       bmNlIHdpdGggdGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczov
       L2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEA
-      Ui44EuwyNtYdXbR40pHO6MYnLZtsmD0wigG6b2/QG3hQIxo3sKvNAI21MTYmU+yH
-      YO4HUR2YwCFxkuzDLT+rXbHmKJSVhJWvpiboblaAxDI4i+7U4RSaMNZ35RzaUZ59
-      05/7dKgicjGprH/WSP6XzD0nQORMQwJ+2M2ZVOiI6xqZuE8mHIGVkd63cns8d342
-      ie/4KFx/ZzkCFcaqFo8DIgzC+ymTTUd6NmRt28ek71m+9Ek7+xnMOw/5X6OfI3fh
-      PH2oklfTFQ/Z0IEtyNURywdJo+m0hxv+rYTHan1rmqmF7uquOLO0Y2tc6KMmF3ul
-      QKlPYGcxYb0NzxSWIFGSCw==
+      TgDJeymKbwhoxx1NLc2pD4ym/6sLoFIcUT1pCVZH0V2S9E4YnJyTn4+6i4Y7nFIg
+      3X44eC9xlV3Do9am+iH3eFQt2ZvCtx/hNKU2J2LsxjK82JPQ0S6FFEBo+yf5kkTs
+      pkxZUayPgfwC+w1FIiJqRL5ieDaY23w2inm//IhOnRaZVVgbCxksD0Nc4vFHtPfA
+      1hOIm4enOKajRyownM1jb14xscKf5UtaBPkFaltieaarScAM94e+cBHihuy15KJ1
+      XM3Zt1iLo/JHKyE2KcRWzQl7fgIWB2pRGyblHCec0aEYYt4JL4DqP2ZGbttDuHY8
+      yEDltgFq5uPF9kL5R7DqXA==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index dbf586f..e6046f1 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -291,8 +291,6 @@ stunnel:
 tags: 
   - amsterdam
   - development
-  - letsencrypt
-  - sandbox-braintree
 webapp: 
   admins: 
     - azul
@@ -318,12 +316,6 @@ webapp:
       - "37.218.242.215"
     monitor: QheDQvXkM43jppngAHJzajv3wRdgeLRt
   api_version: 1
-  billing: 
-    braintree: 
-      environment: sandbox
-      merchant_id: fz9c6q2zcw9rr676
-      private_key: c834e558fca1c126d016afb2f7ad6d3b
-      public_key: f5qsrcsspy7byds8
   client_certificates: 
     bit_size: 2048
     digest: SHA256
@@ -560,40 +552,13 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
+  commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGAjCCBOqgAwIBAgISAxu6gnrLkqevoYB+jwqJ0mpEMA0GCSqGSIb3DQEBCwUA
+      MIIGAjCCBOqgAwIBAgISA79qQMTqpPH9x//8bPZAJt9eMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MTgxOTM0MDBaFw0x
-      NzA3MTcxOTM0MDBaMBoxGDAWBgNVBAMTD2Rldi5iaXRtYXNrLm5ldDCCAiIwDQYJ
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTMwMDBaFw0x
+      NzA3MjYxOTMwMDBaMBoxGDAWBgNVBAMTD2Rldi5iaXRtYXNrLm5ldDCCAiIwDQYJ
       KoZIhvcNAQEBBQADggIPADCCAgoCggIBALgKYaWVwXrg2n8ojpff4inIEzU6vP7d
       PAhal95VtoiQWInTQI4/M39IFd11aF5BUxa/ruZHgc32WloTkNx8DoGuPB1q1yQH
       ZbEpdxsGQfvDICwQKNLdI0JYTKgIADcG4dsxXG8P6VwwdBp5V+bD8Jorhp30iJL3
@@ -616,13 +581,13 @@ x509:
       AjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24g
       YnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0
       aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5
-      cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAdUO34H/r+DBY9
-      HXXGtMVP0Hc3DcyGu4pvyBNCpW3MZk2+bvN37oYtw1MDE16crpawx6RxovtnQcQk
-      dnr33oe1z5Rn70Fe/VF5bWYEtizUR6YxeEhgP6S7sUdL1Rp1fBI0M4OhObJ+9fQj
-      W5OJDq3Hn2/gbucVUWendEz5pikKkMlj0TTJdy/e3q5ZOMh8zYnSxabTstzfrQJ6
-      1wnlxnJRc4hOnWEafeOBSkcrYkywoUsdhvsmRlQAmh4IRNmloWBy9FN6IXwQ+clH
-      EHBxs/AHViMpkw6GfYk5Lp0acbfxii9ayYAPWtl+rtjKRXrJUTHjdDV5vYDSE2u8
-      mPx2EanW
+      cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAKIEbTEHigjdYs
+      wqW2sxqbmJ5+dMoBg2XZpckFy7A3Pts+nDWWkhKxGsvpG48t2IiWZzcr0jdlfT8j
+      ewX5UGcfGSF1CF7KK4NMKnfp/Wk7YlBNJ+Ey+QqExLzIFten9P3uUgqP8Dd8bXBY
+      ezj8oyFZ0CheDvuBkxeKI73E1QPSxYT/WtPYbVfbWNoYhtp9ytm0F3/0FxOxzBDj
+      UhuAJ1pV0Z3rRtXQYe2jrNIN15kHzJzTONb5yTtaNwbvxCFTfaR10vMgUlP1BRgD
+      JTdFGpjjvcNTsWBSRmffOE2kGmZwdhcn9FmKxKUsbLtJCWZMW2fft1ph28RE0xwH
+      j5yHgJ/v
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 8b504ea..3498784 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -556,10 +556,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGBDCCBOygAwIBAgISA6FYOGFmIw8D8I0dbKieJJwGMA0GCSqGSIb3DQEBCwUA
+      MIIGBDCCBOygAwIBAgISA9tR2uVBHodlJfkP809l7hf8MA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzAyMjMwNzI5MDBaFw0x
-      NzA1MjQwNzI5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxODM0MDBaFw0x
+      NzA3MjYxODM0MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
       qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
       ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -582,13 +582,13 @@ x509:
       BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
       biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
       IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
-      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAHcK0AcT9fcG
-      jRxK+FhFzKRDgRxTtZ49Zv6ctkNVto6DejF5ZOnHBACLuxjVNgMO8CJPG6tY6qV5
-      5JFI/1FzVd0KSSwMMq7tbx8Iol7y3RUYIr0D56ITHbzs8Rev4UDD2cW5V2hRykGz
-      WCKdLEDHBEkOt2b7SA01i1vqrt0hKCgePojlR4wYRMWT+WYFMqc/f5ThZiKZk92I
-      6r6cXb6m5TtTMpl2cVw2JzBtV3U+XejTF5M6lRDOiQv2A6vq4T+mWbcFdyqhrFpg
-      CNTY/KyZOOfWcCxmLZfYX+nsG5sym/cIYSpNfckmoxWY51smQw8aYUdSbqcVwTRg
-      JHXqnZACAzY=
+      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAI0M1wPJ0DGi
+      D9/URLMCZmFpQfyvjXK051DAN5VVmbaQPFgYNFOvzooOGmUkPHQWDLM5kQ4Ot2i7
+      t9f6yHJhSKgxdn3ZEORmu5psh54+nwBD074k4qCQ03YTqoyfTaj3MQA10CPgCzK+
+      fYc1lpAo4oZPP/dw3NvdIvM2ZYZGsNdfwIdV79DziNsyP87IFzjodiBF/Z9wxiT9
+      Ti9QvGSMdhhAl/O8lnwlN2Vl9l3S6LCe5bDVXcx8voxH4AzJFhX1i5c37HfQ76n4
+      objIk88beopgnRkNHRsum8BmYnz6m0nAbi3VdnlJdArzdzQSPPnqVMKu3pN1uz4H
+      9w44V/dyQXY=
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index beb95de..694f068 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -570,10 +570,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGBDCCBOygAwIBAgISA5JvBBa6HqYwnbGe5XWL+pMnMA0GCSqGSIb3DQEBCwUA
+      MIIGBDCCBOygAwIBAgISA0peJ4wsDu9Ix9uCQOvFcmQmMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzAyMjExOTU1MDBaFw0x
-      NzA1MjIxOTU1MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x
+      NzA3MjYxOTM0MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
       SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
       hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
@@ -596,13 +596,13 @@ x509:
       BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
       biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
       IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
-      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAGdJ1twjPCbo
-      Q9LykPyw+7sQ1x0exFFUskbklrnN9nKLClzIu4Y7PHX89+rrvA0GYFj+Gb20wVHC
-      FKVuwj9CP46F/1G9OmVGh5yrnECNHb7sGpyVcdSMEAQEOgMxWFo+LrcZSL7rBj/L
-      Fva0/nXSAywX2YUidN1SK87LisQjD15gYPJLWgoHLYZImIMXggcTGo7XGeMJ1lH5
-      Aa35OjhZM31C2CyTO0f11G3b2iQarJz8XWuOYEAZMSzoHeaXLUnW8yfLII7WkTod
-      DzBTVlYCbd5tqzENDYZzxR+zQ9/vGzhwnCdMxdxSJMYlH1uKT7y6fY1BtLIR11og
-      Rbge7uctXN0=
+      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAGvQxptwz5wT
+      0FkHRkmZRQ45E3De/wv7p3a8wSkiDBR1Ohkk5j5dzzDLlGe4VGkVljp0YggsoGry
+      713Nu4EcTkrgm4pO4ZOYXoosQ9SOcFVYTHg9ji9IYx8hhHUogg3jPchcWAXdKFUS
+      vEi2T42efqiOpnndc9qGgYnabLpa4xmeW4Bb2+WEHBSCmr0ogWeZ/2MMZWAMRY6/
+      ahkTJYkvyZKQruZJled45EzIfPduZBh0eUP8RiqVhXpfuDvNxQougGlQctwXX3nf
+      HQ4v109oL7Nqg0OuuQj70fqgRd2zjvKP9YkoY2vPTnrXH+pc8Xt3eJhtqlssogxh
+      bhI0QAPaHoA=
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index 8a82703..8946862 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -585,39 +585,7 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
-      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
-      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
-      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
-      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
-      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
-      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
-      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
-      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
-      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
-      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
-      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
-      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
-      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
-      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
-      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
-      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
-      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
-      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
-      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
-      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
-      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
-      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
-      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
-      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
-      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
-      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
-      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
-      yV8e
-      -----END CERTIFICATE-----
+  commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
       MIIFdjCCA16gAwIBAgIQFZtzEU7Az+EF+hTeU91wRzANBgkqhkiG9w0BAQsFADBK
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 8df02dd..8d29829 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -226,7 +226,6 @@ stunnel:
 tags: 
   - amsterdam
   - development
-  - letsencrypt
 testing: 
   api_hosts: 
     - elephant.dev.bitmask.net