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

1 files changed, 11 insertions, 46 deletions

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/