1 files changed, 88 insertions, 61 deletions
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 42bb13e..6d47f68 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -565,7 +565,43 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
+  commercial_ca_cert: ~
+  commercial_cert: |
+      -----BEGIN CERTIFICATE-----
+      MIIGBDCCBOygAwIBAgISA4c52n7fEOGJjswDqZD7ZryFMA0GCSqGSIb3DQEBCwUA
+      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA4MzEyMDE2MDBaFw0x
+      NjExMjkyMDE2MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+      CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
+      qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
+      ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
+      ZqzTIeS0lOB3hcWIPeEc8kRkB0M5XI+iE7rg1jWwdrJWjEqmBbgWhr2W6j5uUKCl
+      /jBEUZI6kZB1bDdy4jmvHInQCZNnh8o3YHyopW3kbSdQuPXo1FKrFrOo6uvV5QvX
+      hKdlUOsR+lakGG8nK6sQh0FlNUo4JEuB7Gpy414BE7kDmrd7zu2jA1ezvpHsi47t
+      LZRcxtOPb1KS/5ZSxwZnJFN1o8/nKJi4e+SdWj7xzJYSysgQu4K1APi5kOq942V0
+      mdARcsSX0Mxw4WlS68nx8ZfcAcg+uE3mcR0kEvQ6EuKiB84EdgFqZm75RJZd9tAD
+      0Sp8cvEDtZ1Y/3M048WTFn7J3F/xkl8fmz+b+RgYbEAxb3DCKPjbAQV1c11NYMdj
+      fxi0kJIbbjZzqqT6AZijcfEinxoVh9eaYVlnKefTXXumO8+G9HmgET+pTPOhg0xT
+      utqfP46QNd89gLQaNQik/xvtRxujGkvhm5TPF0YWtD8pr6JZK7V9ENBFqjy+1fID
+      5cQwb5sJzzbfYQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+      MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5
+      AmOl5jUq83up0czS1eGi1ArFtTAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
+      86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
+      dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
+      bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBkZW1vLmJpdG1hc2su
+      bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
+      BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
+      BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
+      biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
+      IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
+      cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAHtHGId40wTs
+      4jX/DibaasJVQ7f89QZWzFH/+9oXYJGW7fFRtxkyD5yUpQR13Z95JYEXe3Grs4Gq
+      Jt1QY5SBDui8uYI3h940d/VDw66W6A87NEZam4Vhdcx6m92LzSdQySxY2/9zZqzr
+      ZXs65CiNnDtjk44H5/io4hogsL2p/ZnRZrS/hrXywwa/01V9I5NhQUF30n6Ch426
+      gLbvIlFdzdO92kKvNsU/vh+JnHFxDh16TQMJbyC7LKraqM0wy8DhkUKEaWMjM65K
+      0PrjQmPCEL9CbgcSNEAehs00asnEidVqVJqJwYeYvT+oi+H+1SY7RT7/rl5y5K+d
+      5FoZS43x9VA=
+      -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
       MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
@@ -593,67 +629,58 @@ x509:
       PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
       KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
       -----END CERTIFICATE-----
-  commercial_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFZDCCBEygAwIBAgISA78eQ6wk8YCqT9w8r5h6QRfiMA0GCSqGSIb3DQEBCwUA
-      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA3MTMyMDQ4MDBaFw0x
-      NjEwMTEyMDQ4MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
-      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTogAswbQSKrLS8AZf73L+MKf1HPEu
-      zsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2DkllzldN4Felb4k7p
-      1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6XrZIu5EcpQoTyHG4R
-      V6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYCp+Lufqae4xVh7sQw
-      5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa3XvCqt+vl1x4wDTA
-      mgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3AB5SfcvjAgMBAAGj
-      ggJxMIICbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGcwIPWo3Xb+fQfuHyTJq1Vq
-      bR+/MB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
-      BGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0
-      Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
-      dC5vcmcvMHsGA1UdEQR0MHKCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
-      dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCGHdhbGxhYnkuZGVt
-      by5iaXRtYXNrLm5ldIIUd3d3LmRlbW8uYml0bWFzay5uZXQwgf4GA1UdIASB9jCB
-      8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYGCCsGAQUFBwIBFhpodHRw
-      Oi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENl
-      cnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFy
-      dGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmljYXRl
-      IFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0
-      b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEATurnMUYbPVctxKvtYIkRJ1MCOUJqg5OM
-      ZXIqqbqBD3KfS0ylfuUbY/5WeGt+wIH3YQL5nlYG2eVbO4WdZNlVow8oo8yGwNRK
-      vkYiturL9TI02WcQ5+zmBHlTxbEdrXGfpHpCnx76Gu78ywcoSsGKjBepv04+LTt0
-      1HcUR/e6fup0r4DIIoX9UwS0zVaIJFHxe7ZzvOo5A+vSgnYONo9Alw0aK5oldnmI
-      d05hhSwqgM074mbWJKWsEEdxlUrWxvQE7LqAGO+T/koctxrnuaaeyo8js6NOgO54
-      Xg75gRgGqJcSW7WQxZzoNvRzlLHQjVWAHeKpD/p96/5BNCGxxlLCrQ==
-      -----END CERTIFICATE-----
   commercial_key: |
-      -----BEGIN PRIVATE KEY-----
-      MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDTogAswbQSKrLS
-      8AZf73L+MKf1HPEuzsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2D
-      kllzldN4Felb4k7p1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6X
-      rZIu5EcpQoTyHG4RV6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYC
-      p+Lufqae4xVh7sQw5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa
-      3XvCqt+vl1x4wDTAmgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3
-      AB5SfcvjAgMBAAECggEBAL2q77ss8uRhLhkMErqCEC4tjymHAcRwfLOnG/ZgT6rx
-      GmTLvY/5s1TQk5GTEvEDnvs1SwT8Mv8F5tIHJHIJshdqk9TMcurxKlYV1eFhKyqV
-      M9msmGuYL19p5+GHmAH49Tz8+aur2dgc8AjB/0RVRE1/F0UhI6gZQtlViwcPf0V4
-      t3loVXNAIFuBYTtu1t1iH5DK0ML8wu2aOfwHTHFKsJ4INt0sm0thjL19iasNlsaB
-      ads7q3p1btMKXeSEYYOxVsYglJ+NSqPtpEw7E3Z6JgULl1alc2Z3ePMqkLPpSXmg
-      Mt7RtpTvC/g5M9E7ss+7i3M4pm2xjFjFyc/jexpD0UkCgYEA+VVLEdxaVhAga2XP
-      ceNkNNt7qLWFQX+nhXFR1TyZm6SE1PxSoCZa/7Km1KqSbty0Wgws2Fv1UzAqJp0n
-      yDIZwdq0u2nijAsBmEL7Epf5L/JPUSCL+Vs1hP+tiXCgv75otu8B0G/OZ6DE4Iz6
-      la1XrMn2v9offeB4Juq0XiEgatcCgYEA2UqlMDKzOOkK+0KANUoIoG/WTS4hTLFN
-      upUR+IJ9jJ2ocYMHNO49kIrbLWmL79L6wQKJbKOWk7w0xo3XD4tZW5193ui/RxH/
-      lVa/41N5dpftCBQ2H5j3zGY2tsI+tXqV/vQVDFBR4Xa+bQJvL4sf8nWywyQB2i8T
-      vqaGQXgEcdUCgYEA1s3Jr+iEFzMrivsaXgbGVNdmULGZzRT6MPewxaHAwJtbKNb9
-      JCYHLdUu73bIUyRnaFCm7ftDfli3Z67rEAlBsYYHQJL3bykoRZInFhzBvLHn7X+5
-      t6kBkcRoMElM5ARZ2IhOqtE4JIUYOFCcrgi5yQ3yO9TiXqLdQMHhhFrLv98CgYEA
-      szjtTPbUemFFLH7qTonU2bfE833T+3TWnsmru+Std1jmgVHIlPDYGKtfInLG+DV1
-      m9Li1JeNcCcxBIAjXW/bcURSeJRSiGUhAOU/eln0ekvPNvWsup0p7g50nINUw8zr
-      gRGDdtec4bFWWYVDfdxrqklH+8psOLDRwVOKst8yE00CgYEAuBjCMuz48InN+xeM
-      WXhlby6TgZBoRyTZrTACtJBYGTKUlmOwwMgXVwF3BCvDhOKaLcUXD+nQOA4zWo0R
-      zWmo1f6sQ5LWWdvujapWSDL9l7ZZdY8ZwAk4uidBk+2nx5D3ACnh6xmr4b28VqKz
-      wbakjQdJc37xZwm2AxiBA8tBv0E=
-      -----END PRIVATE KEY-----
+      -----BEGIN RSA PRIVATE KEY-----
+      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
+      -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIJKgIBAAKCAgEAvNv8lkZuLh6x1M3DNiVWv8xQ8M0qGzwYCVbOjnRkLaFADSeR