renewe cdev cert

3 files changed, 180 insertions, 122 deletions

diff --git a/files/cert/cdev.bitmask.net.crt b/files/cert/cdev.bitmask.net.crt
index 9a23782..4ed0e29 100644
--- a/files/cert/cdev.bitmask.net.crt
+++ b/files/cert/cdev.bitmask.net.crt
@@ -1,32 +1,62 @@
 -----BEGIN CERTIFICATE-----
-MIIFcTCCA1mgAwIBAgIRAMO8F8ZMG55dSjVovmxN4eYwDQYJKoZIhvcNAQELBQAw
-SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MTAwMjAwMDAwMFoXDTE2
-MTAwMjAwMDAwMFowLTEQMA4GA1UECgwHQml0bWFzazEZMBcGA1UEAwwQY2Rldi5i
-aXRtYXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM5JAdYY
-K5ecLP8zKQEC6C08lQ27znlI8sSYqQqODuYiwA8paH2FddcGLw+wTwZNBwWyN2/z
-qfMud8NivR/v49XwWzhbET6E3xPx16utgz3QVt6uz2CbMhA5FgT6LJee49KIaTlc
-E1O6AO+v59gx+89/lvT3ZIRkMZdM3ER2dreiJqfRqPaxSV/BPiIqKBLPhhdV3FN8
-RVpOEpR2d1gs+U1AHTQ12RIb8466oiUkINP+fifIWbpjbntfR83TIVreuvpsTBx4
-RtNcJezPJnjGxYDybVXoHiei65YQldoEA/tEQlEM33mbgCrv+PsJZ6eAccH4xwYc
-URsKWtbcbjRa167GFLwQc2sfbfJ2oDUIFk8ICoRHoe2IXmk2PY+u2qDj8nn/ycAC
-woFGRDcnjrrcXHNogVwg49kgAqZ7502TBC3xPnmYQncpLTIC7/C7jXGjPz0U372l
-mUQXp0qz83Joa6r0NH33WoaCkJ5A4BJgo7s4Cm0U1st1LRBE4lIri25CZswuAYMd
-Xr2Jcd2e6lbNoJJhVksc4sHIyctTPthQec417kXwCcgQNKUMX1apdIglJj3NmwBk
-ojS9V1BPA2TogMHN1AYeS4nZ/UlIPslVxUa2PLLEPz7IcH8GQGqy50VLK3iFW1lV
-sRyf2ygqwdiO5Vfci1onVmdZh9mSv7kvY7RtAgMBAAGjbzBtMB0GA1UdDgQWBBS0
-4pvDNSzeeFpBBjvRTQC/4Sl2CjALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYB
-BQUHAwEwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4P
-jzANBgkqhkiG9w0BAQsFAAOCAgEAU81WNNlZkvHZzmIfBosqFP7J5+Q85GkLpdvV
-qomu+/CkDrT7bdKuRMdJJcoQ6fe8FdRvIss8ko+QFe7kBeV/OX8wIn2A5176HmYC
-PgDLrpnOV/LZPrlqAOxorVMiGiVYz0ZnbzYndpcWAmhqLNJjaMkoIwozRjVn+n6y
-DABfNf/C9IloZtR/eOP39xDaHUH82uQLhLimIvlyLEcUKaDGs707ZUkJGi7TZoZu
-TJGCoD0sohISmIazsexsenPyQwMap4etNrOVIBnd2r8I2Ga9/vNh7myaI30NvpYJ
-IIB0Gw+BmSuOmOPBJc/W21sPcTo2aJTSKFBeLHx6GP6UXK8t4cVcNejsIfaDh0si
-7bDhTpt1rcIrenz+PJ4ITFAX92UX783tj6YZW2mUCUKzZ5S+DnAMCo3VzWEaB6aF
-q0FTmKxT5ULGfQN6zh/jwIW3Gk931yLbyZ0FLTjxkjMf/PQFv3V9C5Os+QKYpK9u
-Hrj1D1aIV91yg0KET+a9yp0fvqGPzkiKssvc8HhQp4NoGZHAY4QQjAAaHeLC4Ys4
-OIuNwCphenh0nzIyKsdtwzc87KwxdJNs/vDJjmUGIHiwQQnMy4Lb/OWwN2nI4Dew
-6UwoXVtsJ43nUwBt0x6gfLhqx2oYC4xNtt0T37Gl3Py6HhK1i7w4YwPy4qhpztqG
-unY/ciI=
+MIIGBDCCBOygAwIBAgISA0C52ubsyFgaJwvEsAWRgqEZMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDIyMTMzMDBaFw0x
+NjEyMzEyMTMzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
+SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
+hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
+ZDGXTNxEdna3oian0aj2sUlfwT4iKigSz4YXVdxTfEVaThKUdndYLPlNQB00NdkS
+G/OOuqIlJCDT/n4nyFm6Y257X0fN0yFa3rr6bEwceEbTXCXszyZ4xsWA8m1V6B4n
+ouuWEJXaBAP7REJRDN95m4Aq7/j7CWengHHB+McGHFEbClrW3G40WteuxhS8EHNr
+H23ydqA1CBZPCAqER6HtiF5pNj2Prtqg4/J5/8nAAsKBRkQ3J4663FxzaIFcIOPZ
+IAKme+dNkwQt8T55mEJ3KS0yAu/wu41xoz89FN+9pZlEF6dKs/NyaGuq9DR991qG
+gpCeQOASYKO7OAptFNbLdS0QROJSK4tuQmbMLgGDHV69iXHdnupWzaCSYVZLHOLB
+yMnLUz7YUHnONe5F8AnIEDSlDF9WqXSIJSY9zZsAZKI0vVdQTwNk6IDBzdQGHkuJ
+2f1JSD7JVcVGtjyyxD8+yHB/BkBqsudFSyt4hVtZVbEcn9soKsHYjuVX3ItaJ1Zn
+WYfZkr+5L2O0bQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS0
+4pvDNSzeeFpBBjvRTQC/4Sl2CjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
+86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
+dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
+bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBjZGV2LmJpdG1hc2su
+bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
+BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
+BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
+biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
+IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
+cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBADFaDkKcaU9G
+3r1WaGmHWqYwM08s9m/mTx4JiT1fqpO53LodCNfrdRl8rhr0VBMYNL0UIETKVA9j
+1ruJEde1J4nyk7i8iD8WXsLwipQIWvuMXEto2CW4FFxFcm9s99ilLsE6E3Bl20YA
+m1IzoosBiT0S0tCLzcGxEK42Si//uY0+Bqiw2iaoK5wdS251dSbmORPW3ISbXiFm
+JRP4GM8jgciSMfR04WW5Y/M4/5XIlEOArRxjMYqthHvHCXgTzWsTlcQPSKo25EDX
+hdWiOWuyQ8ljdFjK8ugdLd4kNxXROEuoVodGnK70sUUEEE9XBFW/1DaIrdTNX2m4
+wVIHAVSETaI=
+-----END CERTIFICATE-----
+-----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-----
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index cd7db8d..91e29fc 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -627,71 +627,69 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
+  commercial_ca_cert: ~
+  commercial_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
+      MIIGBDCCBOygAwIBAgISA0C52ubsyFgaJwvEsAWRgqEZMA0GCSqGSIb3DQEBCwUA
+      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDIyMTMzMDBaFw0x
+      NjEyMzEyMTMzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+      CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
+      SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
+      hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
+      ZDGXTNxEdna3oian0aj2sUlfwT4iKigSz4YXVdxTfEVaThKUdndYLPlNQB00NdkS
+      G/OOuqIlJCDT/n4nyFm6Y257X0fN0yFa3rr6bEwceEbTXCXszyZ4xsWA8m1V6B4n
+      ouuWEJXaBAP7REJRDN95m4Aq7/j7CWengHHB+McGHFEbClrW3G40WteuxhS8EHNr
+      H23ydqA1CBZPCAqER6HtiF5pNj2Prtqg4/J5/8nAAsKBRkQ3J4663FxzaIFcIOPZ
+      IAKme+dNkwQt8T55mEJ3KS0yAu/wu41xoz89FN+9pZlEF6dKs/NyaGuq9DR991qG
+      gpCeQOASYKO7OAptFNbLdS0QROJSK4tuQmbMLgGDHV69iXHdnupWzaCSYVZLHOLB
+      yMnLUz7YUHnONe5F8AnIEDSlDF9WqXSIJSY9zZsAZKI0vVdQTwNk6IDBzdQGHkuJ
+      2f1JSD7JVcVGtjyyxD8+yHB/BkBqsudFSyt4hVtZVbEcn9soKsHYjuVX3ItaJ1Zn
+      WYfZkr+5L2O0bQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+      MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS0
+      4pvDNSzeeFpBBjvRTQC/4Sl2CjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
+      86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
+      dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
+      bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBjZGV2LmJpdG1hc2su
+      bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
+      BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
+      BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
+      biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
+      IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
+      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBADFaDkKcaU9G
+      3r1WaGmHWqYwM08s9m/mTx4JiT1fqpO53LodCNfrdRl8rhr0VBMYNL0UIETKVA9j
+      1ruJEde1J4nyk7i8iD8WXsLwipQIWvuMXEto2CW4FFxFcm9s99ilLsE6E3Bl20YA
+      m1IzoosBiT0S0tCLzcGxEK42Si//uY0+Bqiw2iaoK5wdS251dSbmORPW3ISbXiFm
+      JRP4GM8jgciSMfR04WW5Y/M4/5XIlEOArRxjMYqthHvHCXgTzWsTlcQPSKo25EDX
+      hdWiOWuyQ8ljdFjK8ugdLd4kNxXROEuoVodGnK70sUUEEE9XBFW/1DaIrdTNX2m4
+      wVIHAVSETaI=
       -----END CERTIFICATE-----
-  commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      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
-      unY/ciI=
+      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_key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml
index f227c0f..e91a259 100644
--- a/hiera/mudskipper.yaml
+++ b/hiera/mudskipper.yaml
@@ -663,36 +663,66 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFcTCCA1mgAwIBAgIRAMO8F8ZMG55dSjVovmxN4eYwDQYJKoZIhvcNAQELBQAw
-      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MTAwMjAwMDAwMFoXDTE2
-      MTAwMjAwMDAwMFowLTEQMA4GA1UECgwHQml0bWFzazEZMBcGA1UEAwwQY2Rldi5i
-      aXRtYXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM5JAdYY
-      K5ecLP8zKQEC6C08lQ27znlI8sSYqQqODuYiwA8paH2FddcGLw+wTwZNBwWyN2/z
-      qfMud8NivR/v49XwWzhbET6E3xPx16utgz3QVt6uz2CbMhA5FgT6LJee49KIaTlc
-      E1O6AO+v59gx+89/lvT3ZIRkMZdM3ER2dreiJqfRqPaxSV/BPiIqKBLPhhdV3FN8
-      RVpOEpR2d1gs+U1AHTQ12RIb8466oiUkINP+fifIWbpjbntfR83TIVreuvpsTBx4
-      RtNcJezPJnjGxYDybVXoHiei65YQldoEA/tEQlEM33mbgCrv+PsJZ6eAccH4xwYc
-      URsKWtbcbjRa167GFLwQc2sfbfJ2oDUIFk8ICoRHoe2IXmk2PY+u2qDj8nn/ycAC
-      woFGRDcnjrrcXHNogVwg49kgAqZ7502TBC3xPnmYQncpLTIC7/C7jXGjPz0U372l
-      mUQXp0qz83Joa6r0NH33WoaCkJ5A4BJgo7s4Cm0U1st1LRBE4lIri25CZswuAYMd
-      Xr2Jcd2e6lbNoJJhVksc4sHIyctTPthQec417kXwCcgQNKUMX1apdIglJj3NmwBk
-      ojS9V1BPA2TogMHN1AYeS4nZ/UlIPslVxUa2PLLEPz7IcH8GQGqy50VLK3iFW1lV
-      sRyf2ygqwdiO5Vfci1onVmdZh9mSv7kvY7RtAgMBAAGjbzBtMB0GA1UdDgQWBBS0
-      4pvDNSzeeFpBBjvRTQC/4Sl2CjALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYB
-      BQUHAwEwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4P
-      jzANBgkqhkiG9w0BAQsFAAOCAgEAU81WNNlZkvHZzmIfBosqFP7J5+Q85GkLpdvV
-      qomu+/CkDrT7bdKuRMdJJcoQ6fe8FdRvIss8ko+QFe7kBeV/OX8wIn2A5176HmYC
-      PgDLrpnOV/LZPrlqAOxorVMiGiVYz0ZnbzYndpcWAmhqLNJjaMkoIwozRjVn+n6y
-      DABfNf/C9IloZtR/eOP39xDaHUH82uQLhLimIvlyLEcUKaDGs707ZUkJGi7TZoZu
-      TJGCoD0sohISmIazsexsenPyQwMap4etNrOVIBnd2r8I2Ga9/vNh7myaI30NvpYJ
-      IIB0Gw+BmSuOmOPBJc/W21sPcTo2aJTSKFBeLHx6GP6UXK8t4cVcNejsIfaDh0si
-      7bDhTpt1rcIrenz+PJ4ITFAX92UX783tj6YZW2mUCUKzZ5S+DnAMCo3VzWEaB6aF
-      q0FTmKxT5ULGfQN6zh/jwIW3Gk931yLbyZ0FLTjxkjMf/PQFv3V9C5Os+QKYpK9u
-      Hrj1D1aIV91yg0KET+a9yp0fvqGPzkiKssvc8HhQp4NoGZHAY4QQjAAaHeLC4Ys4
-      OIuNwCphenh0nzIyKsdtwzc87KwxdJNs/vDJjmUGIHiwQQnMy4Lb/OWwN2nI4Dew
-      6UwoXVtsJ43nUwBt0x6gfLhqx2oYC4xNtt0T37Gl3Py6HhK1i7w4YwPy4qhpztqG
-      unY/ciI=
+      MIIGBDCCBOygAwIBAgISA0C52ubsyFgaJwvEsAWRgqEZMA0GCSqGSIb3DQEBCwUA
+      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDIyMTMzMDBaFw0x
+      NjEyMzEyMTMzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+      CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
+      SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
+      hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
+      ZDGXTNxEdna3oian0aj2sUlfwT4iKigSz4YXVdxTfEVaThKUdndYLPlNQB00NdkS
+      G/OOuqIlJCDT/n4nyFm6Y257X0fN0yFa3rr6bEwceEbTXCXszyZ4xsWA8m1V6B4n
+      ouuWEJXaBAP7REJRDN95m4Aq7/j7CWengHHB+McGHFEbClrW3G40WteuxhS8EHNr
+      H23ydqA1CBZPCAqER6HtiF5pNj2Prtqg4/J5/8nAAsKBRkQ3J4663FxzaIFcIOPZ
+      IAKme+dNkwQt8T55mEJ3KS0yAu/wu41xoz89FN+9pZlEF6dKs/NyaGuq9DR991qG
+      gpCeQOASYKO7OAptFNbLdS0QROJSK4tuQmbMLgGDHV69iXHdnupWzaCSYVZLHOLB
+      yMnLUz7YUHnONe5F8AnIEDSlDF9WqXSIJSY9zZsAZKI0vVdQTwNk6IDBzdQGHkuJ
+      2f1JSD7JVcVGtjyyxD8+yHB/BkBqsudFSyt4hVtZVbEcn9soKsHYjuVX3ItaJ1Zn
+      WYfZkr+5L2O0bQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+      MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS0
+      4pvDNSzeeFpBBjvRTQC/4Sl2CjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
+      86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
+      dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
+      bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBjZGV2LmJpdG1hc2su
+      bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
+      BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
+      BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
+      biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
+      IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
+      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBADFaDkKcaU9G
+      3r1WaGmHWqYwM08s9m/mTx4JiT1fqpO53LodCNfrdRl8rhr0VBMYNL0UIETKVA9j
+      1ruJEde1J4nyk7i8iD8WXsLwipQIWvuMXEto2CW4FFxFcm9s99ilLsE6E3Bl20YA
+      m1IzoosBiT0S0tCLzcGxEK42Si//uY0+Bqiw2iaoK5wdS251dSbmORPW3ISbXiFm
+      JRP4GM8jgciSMfR04WW5Y/M4/5XIlEOArRxjMYqthHvHCXgTzWsTlcQPSKo25EDX
+      hdWiOWuyQ8ljdFjK8ugdLd4kNxXROEuoVodGnK70sUUEEE9XBFW/1DaIrdTNX2m4
+      wVIHAVSETaI=
+      -----END CERTIFICATE-----
+      -----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_key: |
       -----BEGIN RSA PRIVATE KEY-----