7 files changed, 280 insertions, 541 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 5cf00c1..29f5d68 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -85,8 +85,8 @@ mail:
     - leech.demo.bitmask.net
 name: ant
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: internal_service
 services: 
   - couchdb
@@ -108,11 +108,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/frog.yaml b/hiera/frog.yaml
index 812d32c..7dd3cc8 100644
--- a/hiera/frog.yaml
+++ b/hiera/frog.yaml
@@ -20,8 +20,8 @@ mail:
   smarthost: []
 name: frog
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_service
 services: 
   - static
@@ -43,11 +43,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -90,7 +90,7 @@ static:
   bootstrap_files: 
     client_version: 
       max: ~
-      min: "0.5"
+      min: "0.7"
     domain: bitmask.net
     enabled: true
     provider_json: ~
@@ -166,180 +166,92 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIFRzCCBC+gAwIBAgIRAIiAJK7IsuBA+JvWo/fz72MwDQYJKoZIhvcNAQELBQAw
+          MIIGRjCCBS6gAwIBAgIRAMXTXEN0h4ykzS3Z4Z5tmyYwDQYJKoZIhvcNAQELBQAw
           gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
           BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
           VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-          Q0EwHhcNMTQwNDA5MDAwMDAwWhcNMTUwNDA5MjM1OTU5WjBPMSEwHwYDVQQLExhE
+          Q0EwHhcNMTUwNDAyMDAwMDAwWhcNMTYwNDE1MjM1OTU5WjBPMSEwHwYDVQQLExhE
           b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRQw
-          EgYDVQQDEwtiaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-          ggEBAJ2WX3PsIR4H8M+bmwWsOVWQkYyj9c+Fck0x+NLqo4PijtwHYd9XkYq58lmB
-          vBxaRDpD7h4/huT1uFjM3eVacCT7Vdn4Wj2FO/8j51qN7gzfGlSB59YViALGHyHU
-          aBNqdnyTYrDjBaGjdF/x0qNGTeHaZ+Rs1W9SagHpgT1kEcAgdl0s5nhpfKhlUSrB
-          RALUiRLCt04+n7dtNQ3uLEkTcLZfOjAs5qTICM5aVmV3A5JsNxwGQXtUbBTsc4W8
-          fUy7w3WGAol2WE1TsFZpsC/abwXfCY9XHuxZNwjFnjDY7Xz6iB4kwCYdClzkKAE2
-          27KqyC/e9sSCFK8w7JQl0a5WyGMCAwEAAaOCAdowggHWMB8GA1UdIwQYMBaAFJCv
-          ajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQO9n1BWSPToPPLZH03k1nc3qYf
-          HzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-          BQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggr
-          BgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIB
-          MFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9E
-          T1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUF
-          BwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09N
-          T0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEF
-          BQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCcGA1UdEQQgMB6CC2JpdG1h
-          c2submV0gg93d3cuYml0bWFzay5uZXQwDQYJKoZIhvcNAQELBQADggEBADsxwiuR
-          Msl1oNQCxPcCRXj6lROXzla363eXKP56ssrm+4uUZp9m43/EwiDd9O7gdY0PMdlh
-          ZoaALuTUpunsH0XA5wM2fdlxyGHWC2KmpYvDi/S9A/y9rPME2oz3nnWSysE/sbYU
-          XxQjqunCgypnI/48jXHHx8YFTFDpTOdFZWcF4SmMZcC72lE0d8fSE+mPwGOky3kF
-          BLhWfAH9c/8r4rMU+xePRMCg2VsxKRE92NgzwTFglpME5uT6ybW74GiK0TaTy4zG
-          fGUF/j02nlgbU/wQlbfl52mtnJZ048X6/n/28kYNDRy0PK55C4r+YjX5xTO698IC
-          cEXbYpSH+NajFBQ=
+          EgYDVQQDEwtiaXRtYXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+          ggIBAJcUgSPtPUSCjhuIS2gwqU2/QukygEoZFf3SwR6XmbYj8GkEiXNm79p3T4kC
+          5DEeHpRTrD3KrLir78PLxXC/AIKhRB3+dSoKI8aMfBOBvw0jS/E7AGA+0jdo+Lia
+          Hd9JZgWNl1FLgviIvYixaJTIA9+56ZIFu0s9To9VDEsLixXBMGvBQ+qJTkTrBRsE
+          Etc3EtPX5qYeTOt5zj6ewowlIBYL8yAqxBO0tyYvVBhNW3wnMaELK9oruRgiV06J
+          BdUQqkUoRCRsjgqEMrx2Ah/nMcUgmFR3C8XnrQGVaJLkXp4FKCIHMFrzDO24fEyD
+          dEhCLyXEUpC2P0wEXY9C1m29yuNgk33eA085GNT3X39FWdT58b0HsUZ3Fder144L
+          b4hunHah5pbE+GLvTKSCjWOZHjA+0P0bIjhGzqQPE96sB+hkmmAUuavuTM5YsDaY
+          cahuN9fBUh9BfClmbFb4Rp4qAptcKHc2mQtbF3uXvOb/y3BsMlBQ01dS0WR3JTba
+          BQ9YbF5kuwRoeeQIrj1EDKpMoMgm7L+7t/2ZXnZvXI64uUneRnDi/Qb6PF06gR1U
+          FBSiSkXorQIV+TO53pbNEkfBrL06pzpgTG4mzPyReFhHYKtpAekloaWb1ppcUDz7
+          fSk2SEddinBHLoMWPwMHZ+K02ycXWb38qmxQAGZ2BWxRZYiJAgMBAAGjggHZMIIB
+          1TAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQURlCc
+          FmI2dgueauqLhs7unyuIUQ0wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
+          HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYB
+          BAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNv
+          bS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29t
+          b2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJD
+          QS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5j
+          b21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl
+          ckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCcG
+          A1UdEQQgMB6CC2JpdG1hc2submV0gg93d3cuYml0bWFzay5uZXQwDQYJKoZIhvcN
+          AQELBQADggEBAIsv7f5sxvUm4nvtst9o/KMBjgcuXSB41Ti8v+DVRzz/iyANDZTi
+          hpTHnjnQa4/aXkY1Ko5449MRhHAGPTxEX2cyPHRTg8RcGFQzTpEcTbsOMlL18M8N
+          Vo+qjj/MK3F95nz1lD2EqF58uYkGpmEfqIcbAHpuSab+1btb0zSE+SOpPXML6Az2
+          rqHXGYZ4jKQ0cepyIgR84quczVk2AhvXMNVuYWQUPbZ7CbaVdumwsyRgG6oXcGOP
+          Km7P5HwcqV8577RcSLI7XnYfQgkTH8xtrgD68h4l7AazjhsRoVO60qEx3YQA5cmb
+          zgmKCy3yOhRP0/kZBNsbIXH3w4lOmNQ2zNE=
           -----END CERTIFICATE-----
       key: |
-          Public Key Info:
-          	Public Key Algorithm: RSA
-          	Key Security Level: Legacy (2048 bits)
-          
-          modulus:
-          	00:9d:96:5f:73:ec:21:1e:07:f0:cf:9b:9b:05:ac:
-          	39:55:90:91:8c:a3:f5:cf:85:72:4d:31:f8:d2:ea:
-          	a3:83:e2:8e:dc:07:61:df:57:91:8a:b9:f2:59:81:
-          	bc:1c:5a:44:3a:43:ee:1e:3f:86:e4:f5:b8:58:cc:
-          	dd:e5:5a:70:24:fb:55:d9:f8:5a:3d:85:3b:ff:23:
-          	e7:5a:8d:ee:0c:df:1a:54:81:e7:d6:15:88:02:c6:
-          	1f:21:d4:68:13:6a:76:7c:93:62:b0:e3:05:a1:a3:
-          	74:5f:f1:d2:a3:46:4d:e1:da:67:e4:6c:d5:6f:52:
-          	6a:01:e9:81:3d:64:11:c0:20:76:5d:2c:e6:78:69:
-          	7c:a8:65:51:2a:c1:44:02:d4:89:12:c2:b7:4e:3e:
-          	9f:b7:6d:35:0d:ee:2c:49:13:70:b6:5f:3a:30:2c:
-          	e6:a4:c8:08:ce:5a:56:65:77:03:92:6c:37:1c:06:
-          	41:7b:54:6c:14:ec:73:85:bc:7d:4c:bb:c3:75:86:
-          	02:89:76:58:4d:53:b0:56:69:b0:2f:da:6f:05:df:
-          	09:8f:57:1e:ec:59:37:08:c5:9e:30:d8:ed:7c:fa:
-          	88:1e:24:c0:26:1d:0a:5c:e4:28:01:36:db:b2:aa:
-          	c8:2f:de:f6:c4:82:14:af:30:ec:94:25:d1:ae:56:
-          	c8:63:
-          
-          public exponent:
-          	01:00:01:
-          
-          private exponent:
-          	6f:fc:28:20:cc:b0:4c:13:00:81:c7:e6:46:05:b9:
-          	48:a0:cf:8d:ce:06:24:4e:84:87:6e:f7:8f:8a:c6:
-          	60:36:63:a6:e0:68:20:ba:ad:e6:93:75:31:3e:0c:
-          	5b:69:9a:0a:7d:b3:7d:33:4f:bc:ed:10:ef:a9:c6:
-          	15:f2:4a:b7:3d:14:29:2d:5f:93:50:56:ee:5c:a9:
-          	4f:a4:84:82:09:19:40:ec:7f:bf:96:d5:6c:83:36:
-          	24:68:38:fd:73:2e:78:20:94:85:77:0e:cd:6a:c6:
-          	8c:57:e0:83:be:b6:21:c5:7f:06:c8:80:73:f7:70:
-          	f5:a2:e6:00:a6:58:26:da:cd:4a:34:97:e2:88:8e:
-          	a0:cf:60:0b:cc:f4:d6:11:0f:60:38:5b:66:02:2a:
-          	db:5a:c6:1f:ca:ba:e8:f0:24:5c:b4:d2:d5:83:77:
-          	85:ab:7c:70:d0:b3:f8:ec:fc:d9:45:9b:f8:36:6f:
-          	ef:f4:a1:4a:d5:f7:41:01:a2:b1:dd:9f:a1:e7:a8:
-          	9f:01:c2:3d:95:de:c7:05:0e:f8:35:c6:7d:1d:f6:
-          	1b:97:35:0d:95:b0:aa:22:fa:62:57:e9:cf:9e:55:
-          	2a:37:7a:9a:9c:00:95:a0:8d:19:9e:3c:94:2d:d5:
-          	2a:0e:04:07:34:c3:2a:5c:f5:02:0b:ad:0a:2e:c1:
-          	e1:
-          
-          prime1:
-          	00:c8:21:88:03:e9:e2:06:b7:41:41:57:ab:be:d1:
-          	d6:28:11:49:0b:7b:8a:f8:e3:3e:9b:87:de:76:7f:
-          	2a:c8:d5:e9:1b:fc:76:7f:e0:53:c7:c9:78:dd:56:
-          	32:64:04:00:7b:9f:ad:de:5f:15:20:1e:bc:4e:0b:
-          	a9:08:fc:53:21:80:16:7a:8d:3c:d2:06:ad:30:ce:
-          	6a:e0:e0:3e:29:f2:1b:b3:35:21:02:f6:07:d5:8c:
-          	46:49:b9:42:a3:de:ca:24:f9:dc:3f:9b:98:3a:f4:
-          	da:13:34:0a:e7:72:3c:2c:51:7d:bd:dc:77:da:7f:
-          	16:79:42:21:90:eb:00:f9:0f:
-          
-          prime2:
-          	00:c9:94:70:ea:c8:ec:e7:8b:2c:8b:55:28:07:bc:
-          	7e:61:ca:4f:69:d3:5f:f0:ce:eb:06:2b:ee:19:32:
-          	22:74:22:b9:9f:3b:ca:8e:e9:06:53:ba:8e:8d:c8:
-          	ec:c6:0b:40:8a:cb:a4:0b:90:aa:f0:c2:b8:31:7c:
-          	d7:6e:23:6b:ae:40:97:bb:7c:ba:73:be:80:e0:29:
-          	46:36:d2:2a:f9:c1:16:74:44:cf:72:3c:93:22:08:
-          	0d:c3:08:e9:5a:f7:f6:88:b1:7b:af:35:80:3d:c0:
-          	a4:81:95:5f:04:d6:c4:e1:59:83:99:67:14:43:35:
-          	23:45:59:9e:da:12:45:73:6d:
-          
-          coefficient:
-          	19:4a:4e:42:9e:6b:84:21:bf:a6:d5:da:9a:b5:87:
-          	c8:74:12:fe:06:44:7c:3a:3c:d3:c2:89:e4:ce:2a:
-          	f6:20:23:4c:bd:69:1a:ac:a4:d0:66:3e:c9:c2:ab:
-          	14:70:ae:5b:67:31:65:8f:e9:76:ca:c3:eb:7c:dc:
-          	bd:75:9c:f6:3f:1a:2a:77:20:e5:8c:c6:af:64:e1:
-          	a9:51:cc:61:76:18:46:38:b7:37:cd:ac:74:68:57:
-          	2a:9a:36:3e:41:0d:98:50:ab:35:02:e7:45:51:5c:
-          	6a:e2:2f:36:8c:fa:05:32:66:fe:d6:74:32:15:8e:
-          	d1:82:33:fe:6c:25:87:1c:
-          
-          exp1:
-          	00:a4:c2:86:39:c2:98:e4:32:86:34:87:3a:cb:73:
-          	f1:3d:37:4d:cd:78:3e:27:3c:de:54:28:fd:4a:cc:
-          	d2:aa:59:00:fa:9b:53:eb:5f:01:5a:5f:51:73:d6:
-          	fc:d1:3e:42:2f:84:7c:1d:b0:65:b1:f5:db:cc:dc:
-          	e8:a2:8f:28:d9:51:9c:2f:f4:8a:f7:d5:ab:4b:9d:
-          	04:7c:71:e0:7b:a3:e8:8e:16:d5:40:9c:d0:42:4c:
-          	a3:a9:1a:2d:f4:be:fb:e8:89:13:7c:02:5a:c7:5e:
-          	c1:12:42:2c:1f:f2:f9:fa:fa:73:ec:94:ce:cf:41:
-          	05:7d:7a:a6:2b:aa:6d:38:9d:
-          
-          exp2:
-          	28:5e:bf:22:76:2c:e3:ce:3e:94:84:f0:68:64:3a:
-          	97:51:12:08:6a:99:ab:3b:75:5c:1e:0e:28:23:9f:
-          	3c:cc:fb:89:c5:4a:b2:c6:3e:4b:24:70:8a:3a:b4:
-          	18:91:86:52:85:a8:0b:dc:e4:2f:25:80:08:01:2d:
-          	8f:d4:2e:2b:8e:aa:14:95:4d:2e:02:f8:02:6c:a1:
-          	b0:36:f4:fe:61:ca:22:6c:e9:72:c2:68:e1:06:e5:
-          	e2:aa:75:39:8f:b1:62:fc:d0:7d:6d:64:8a:79:7b:
-          	38:ac:76:84:1c:92:ff:62:92:f5:74:ec:5c:ed:56:
-          	6b:fc:1f:d1:22:99:a0:1d:
-          
-          
-          Public Key ID: F6:FC:CB:A2:FA:5C:41:A0:A9:F2:9D:6B:79:94:BA:C2:7D:7D:E7:CB
-          Public key's random art:
-          +--[ RSA 2048]----+
-          |        .        |
-          |       o .       |
-          |      o   .      |
-          |     .   .       |
-          |  . .   S..      |
-          |   o . ooo .     |
-          |   ...o+ .+      |
-          |    o =oo.oo...  |
-          |     o+*+. o++E. |
-          +-----------------+
-          
           -----BEGIN RSA PRIVATE KEY-----
-          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
+          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
           -----END RSA PRIVATE KEY-----
       locations: 
         front: 
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index d66b60e..baa4ec7 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -100,8 +100,8 @@ mynetworks:
   - "85.17.92.143"
 name: leech
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: user_service
 services: 
   - mx
@@ -123,11 +123,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -407,180 +407,92 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFVjCCBD6gAwIBAgIRAPGZlQuiI9dHNEOp2GjMTKYwDQYJKoZIhvcNAQELBQAw
-      gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-      BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-      VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-      Q0EwHhcNMTQwNDA5MDAwMDAwWhcNMTUwNDA5MjM1OTU5WjBUMSEwHwYDVQQLExhE
-      b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRkw
-      FwYDVQQDExBkZW1vLmJpdG1hc2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-      MIIBCgKCAQEAw/DshBrsWt+G2YDZ4GBTcFX3JR+InVNgyXnDBF1DNKVVVI/BjEi9
-      fIeXWGPRU3FW5Y+CLDBrp0d6qpGX8QCj8hFlSmBg4bXAoAT+e6KlWsAFCwmZ1q0d
-      KuBW95ifojkM+NVeASLLcHuy0FshW+c9SgpArE2c0KHT2F67A7FsXuAQkPhPZApT
-      n1OC/Os4I3uLZlRYv75BEPPk3zoysSagWCTASnDaImq/sw0AWEn+cdLXfkkOPE4K
-      03yGBCFmlhwpiqSwYO6MmvdWQGAzXUl5Qt934LZ2S8Si52BKGiIMhcHMfa77hSuJ
-      VDRCxng6zco6N9itRgAzXuptg77qX85CBQIDAQABo4IB5DCCAeAwHwYDVR0jBBgw
-      FoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYEFIaP42OJJm1RiI5NIyUr
-      3JYoNtQsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-      CCsGAQUFBwMBBggrBgEFBQcDAjBQBgNVHSAESTBHMDsGDCsGAQQBsjEBAgEDBDAr
-      MCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8ubmV0L0NQUzAIBgZn
-      gQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-      Q09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNybDCBhQYI
-      KwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9kb2NhLmNv
-      bS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCQG
-      CCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wMQYDVR0RBCowKIIQ
-      ZGVtby5iaXRtYXNrLm5ldIIUd3d3LmRlbW8uYml0bWFzay5uZXQwDQYJKoZIhvcN
-      AQELBQADggEBACkazAUnzL6F3loFc7qg61ZThtUwjAnPuUEHSjUev3vkIjz6mj14
-      Wwvoviz0xGYzqVZr70oEDQX8dkfpKByIYadWlewsQOTg4jIOVs+1GcP3TsEfniPu
-      bIdKOLVe0o1ubTlQ+pitHkH3k35Jgua/k5WhCcg5oWe4wbo8hAioQMRMnbVOUuI6
-      rvhPFH6mEyYwOF3nvJlgGcOLvfZGSiVc86uhOqaF42DU8UBdX1nmMghSX8VeV7TL
-      8K05UR2hUBrorxeJHiM6q4WlcrZLpVwKwqZmSeaa8ARvbQ7RllQO+0FcfVClXdZl
-      NHKdhoaxwQfZa+4mrb2dsr1jyAh08B1UqIM=
+      MIIGVDCCBTygAwIBAgIQTs4jNfKb8/YyxYBtUZPQMDANBgkqhkiG9w0BAQsFADCB
+      kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+      A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
+      BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+      QTAeFw0xNTA0MDIwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMFQxITAfBgNVBAsTGERv
+      bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxGTAX
+      BgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+      ggIKAoICAQDwvMa2z8biMMCkq9whwuVG9pRQn3ebohFGcyOa4c7PDqFHwTVCDmK4
+      8Bq/7w2PC+meQ5NV1Bm6GwWYB9qpRcrmM7VM69Ee8ttp4rKnCk11EO8cktvvP+Ea
+      kKkdaXxLI0BKPzl5RJaFfb4xggHL96cN65ZcVDW+ghloKGsZxwTOQOUfBMksgPQR
+      pO3XzM5BDlWm122gKyRQPWMoXoTOWDmbzydX2sgpZ9jxoMbzAQ9JB7Vjwoz0lqj8
+      94ckXFLDV7qdYWfJHyQNERCqa1rCovIFk61HbCqutfKw//atiAw1NinBUAa2em2i
+      PdKYWpubTAGeZ4MWzgpwg9+5ynUDf3p1XXNAH3R97Y957IPTdAqR4dwShG//xIL7
+      PQUL9csZadMfzlln9rjpNhRTfWiNkB3TA4mUhzvpmpJSp+b6xYpkYgxNQOoscAvk
+      Sz2pUkJFmDXrBnbz8cRD8mD4NRxgif3fEPce3kT97BoDyXL1mX2Hd2nVF2ayjfTQ
+      ZwVjLpV/Hw/MYwJdjxckUVRYHaBbF5i3EbERhtBEOemoHN9hhoiu7nFw7xvu9CuA
+      F3OqoM6E3PDbUDq++XLkpDvdlAscF+RZf9fdhGfe4GmBm72iKHb3e3N4xpQp1Phy
+      OazAFPC0eYoCmDnozL+tkT1guW9gFZ417ho2TggKqu/w7xyuFHxQ7QIDAQABo4IB
+      4zCCAd8wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYE
+      FMOFwfy0IZteBeE2q8oMNaiAvn/AMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+      AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoG
+      CysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9k
+      by5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vY3Js
+      LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2Vy
+      dmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9j
+      cnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVT
+      ZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNv
+      bTAxBgNVHREEKjAoghBkZW1vLmJpdG1hc2submV0ghR3d3cuZGVtby5iaXRtYXNr
+      Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAHzH0R7oXFBzVMCTzxnuU7wHRwIp08w24
+      kjSVzEm31jBHfeq4Eg03Gg9nu4TcGzRvUisziKjq9Ew9OuoQAerqmlL4WyrX5bfH
+      eBdn8qTebTVktqyQXyfI2uOsYmPK+tL97gbCoMMdGirrbi52Wg3HX+J6IP9lZ9iP
+      DStF46CjJaRNRib6J1XSuFPQ3Lf5Ae1RcvSSsZ1nOPnrhW7X7TKbl6sAku1VagfE
+      OEFYUxn2E3rB5wRwaG+SS87nNehMocPqdueW2bTd+f1dVwbhaCjjmB/piD3i5Jy1
+      /4rWOSQXA8zMEpmUOar4WBIEQfkrfTC2zbCyaHmOa+3glxQDeA98oQ==
       -----END CERTIFICATE-----
   commercial_key: |
-      Public Key Info:
-      	Public Key Algorithm: RSA
-      	Key Security Level: Legacy (2048 bits)
-      
-      modulus:
-      	00:c3:f0:ec:84:1a:ec:5a:df:86:d9:80:d9:e0:60:
-      	53:70:55:f7:25:1f:88:9d:53:60:c9:79:c3:04:5d:
-      	43:34:a5:55:54:8f:c1:8c:48:bd:7c:87:97:58:63:
-      	d1:53:71:56:e5:8f:82:2c:30:6b:a7:47:7a:aa:91:
-      	97:f1:00:a3:f2:11:65:4a:60:60:e1:b5:c0:a0:04:
-      	fe:7b:a2:a5:5a:c0:05:0b:09:99:d6:ad:1d:2a:e0:
-      	56:f7:98:9f:a2:39:0c:f8:d5:5e:01:22:cb:70:7b:
-      	b2:d0:5b:21:5b:e7:3d:4a:0a:40:ac:4d:9c:d0:a1:
-      	d3:d8:5e:bb:03:b1:6c:5e:e0:10:90:f8:4f:64:0a:
-      	53:9f:53:82:fc:eb:38:23:7b:8b:66:54:58:bf:be:
-      	41:10:f3:e4:df:3a:32:b1:26:a0:58:24:c0:4a:70:
-      	da:22:6a:bf:b3:0d:00:58:49:fe:71:d2:d7:7e:49:
-      	0e:3c:4e:0a:d3:7c:86:04:21:66:96:1c:29:8a:a4:
-      	b0:60:ee:8c:9a:f7:56:40:60:33:5d:49:79:42:df:
-      	77:e0:b6:76:4b:c4:a2:e7:60:4a:1a:22:0c:85:c1:
-      	cc:7d:ae:fb:85:2b:89:54:34:42:c6:78:3a:cd:ca:
-      	3a:37:d8:ad:46:00:33:5e:ea:6d:83:be:ea:5f:ce:
-      	42:05:
-      
-      public exponent:
-      	01:00:01:
-      
-      private exponent:
-      	3d:07:00:e3:74:6f:41:2e:75:95:b0:e8:2b:56:55:
-      	26:9b:df:ca:14:34:3c:ac:07:6d:39:1b:60:74:9b:
-      	c5:fd:e8:c1:d9:b4:72:b9:05:2b:90:1f:b7:4b:ff:
-      	9a:79:a6:93:01:4b:8d:ef:d6:d7:d7:0f:81:a8:af:
-      	26:45:08:cb:10:57:f7:fe:64:ae:68:29:82:ad:8b:
-      	85:7e:76:f9:f8:ec:99:2f:78:56:c0:bc:60:ea:56:
-      	ab:ef:41:69:09:53:dc:fc:b7:b6:aa:db:aa:41:1c:
-      	c4:80:5d:b7:7e:22:3c:b9:4c:c3:5d:b9:05:d2:21:
-      	65:36:bc:10:be:65:fe:76:46:d4:e1:d9:b5:e6:18:
-      	42:d4:77:d8:4b:95:5c:31:b6:71:57:df:e5:56:7b:
-      	73:8e:61:b8:49:68:c6:aa:12:40:78:6a:c5:6a:c7:
-      	11:3a:e2:51:6d:e7:5d:fd:64:f4:8f:92:e8:ec:c9:
-      	aa:29:5b:22:e8:e3:99:a5:82:38:45:5d:bd:2d:75:
-      	a1:b3:4f:d5:8e:5e:20:58:be:1a:5e:84:24:1c:26:
-      	c8:3b:4a:89:b2:ec:e2:77:20:04:58:35:4e:b6:a9:
-      	cb:fa:f7:16:3b:b1:c3:cc:e0:47:2f:90:dc:5e:a2:
-      	48:4f:1c:33:05:57:e5:84:fb:89:3a:d1:98:6d:d4:
-      	d1:
-      
-      prime1:
-      	00:fa:1f:a7:8e:91:19:68:b8:77:01:c7:f7:a8:7d:
-      	f5:9a:b5:c9:af:35:85:0e:ab:8d:9e:d4:43:39:d5:
-      	81:98:0f:8e:49:64:1e:49:a2:ae:2b:7f:0c:3b:90:
-      	6d:41:93:e2:2e:1c:fd:f1:9b:ab:da:cd:8b:11:53:
-      	f8:c7:d9:5b:dc:02:df:54:4f:ca:1e:b2:bd:ab:76:
-      	40:b2:4b:ac:dd:89:6e:78:e7:ff:74:b1:ab:4f:24:
-      	ce:22:f0:44:96:dd:cb:fd:ac:ef:55:70:41:44:59:
-      	1e:e2:fd:31:72:17:39:a4:c1:77:25:ce:01:33:70:
-      	fe:5e:50:8d:b8:12:84:35:7f:
-      
-      prime2:
-      	00:c8:8b:64:bc:b6:a6:4a:f5:8d:0e:b7:97:a2:9c:
-      	c1:74:70:59:7b:c5:d7:76:65:7a:12:ca:0f:63:cf:
-      	eb:8e:18:98:54:83:39:5f:f0:08:fc:ff:46:70:a7:
-      	18:0c:41:90:72:e4:95:46:94:74:91:e5:15:71:a5:
-      	75:93:c7:57:6d:f4:ca:fe:44:19:86:20:6f:32:e8:
-      	56:67:e5:75:18:81:80:82:e7:a1:d9:f5:3b:b5:84:
-      	6a:16:c4:06:2c:93:b1:79:7f:c5:2d:c4:69:be:23:
-      	af:6f:49:74:3b:ff:29:82:29:5b:9a:67:ac:30:34:
-      	31:c7:15:36:94:3c:8a:72:7b:
-      
-      coefficient:
-      	55:e3:29:4f:ac:ce:af:f0:7d:d3:0a:7e:7e:61:51:
-      	f3:02:51:0e:25:3f:eb:78:a6:04:5f:12:04:60:72:
-      	da:bb:67:6b:40:60:31:c6:dc:e6:ce:b3:3f:9d:f7:
-      	9e:8f:fa:c2:6d:6c:a1:84:1c:9e:9e:c8:75:a7:c1:
-      	e9:82:24:45:97:ea:37:41:f1:3e:6a:62:29:7c:9c:
-      	71:10:f8:e3:7c:92:92:d7:59:41:2c:02:2f:fe:85:
-      	3f:13:3f:d1:c4:42:e5:83:f7:f4:29:d1:26:09:36:
-      	23:31:90:b9:8a:8b:76:47:66:df:7f:3f:87:9b:6f:
-      	04:e3:1d:13:a0:dd:fb:63:
-      
-      exp1:
-      	00:ed:89:68:58:35:a6:7a:d4:4c:78:cd:8e:7e:5e:
-      	79:04:1f:46:55:75:af:52:5a:4b:d9:9d:dd:e6:2b:
-      	c4:b2:43:7b:ae:69:3d:76:52:df:b3:81:29:7d:db:
-      	d0:56:a9:f9:f0:2f:2a:5f:ec:a6:0d:da:8c:0a:bd:
-      	c3:93:0f:f2:74:03:ea:52:28:a0:5b:fd:05:b1:b3:
-      	51:07:c2:64:7d:d3:c9:ad:5b:2e:38:85:8e:9a:4f:
-      	ea:d0:35:7b:fe:06:cf:76:af:68:6f:ac:76:df:50:
-      	ff:cb:34:07:64:41:78:45:e6:51:9f:fe:7f:17:7a:
-      	64:a7:ef:3a:57:a8:86:14:43:
-      
-      exp2:
-      	60:d3:3c:6e:08:d9:bd:33:55:49:97:c6:b4:92:6e:
-      	ac:e3:59:b0:f2:d2:96:ad:64:05:12:5d:df:d9:11:
-      	67:e7:e4:14:59:cf:27:cc:e2:ea:13:ee:54:91:b8:
-      	80:a2:5f:35:b9:bb:80:fa:48:55:f0:7f:2c:01:b1:
-      	05:0a:a7:e1:c4:e1:05:66:a7:d4:24:70:cb:e9:75:
-      	5e:70:60:da:d6:1b:d0:18:3a:02:db:ee:5a:33:76:
-      	6d:4b:73:97:ae:2f:6f:f4:0a:a5:90:41:65:b6:21:
-      	0b:e0:31:28:8e:87:e1:fa:49:ea:00:c8:17:f5:fb:
-      	5a:9d:99:5e:74:e4:7b:65:
-      
-      
-      Public Key ID: 33:C2:75:BD:B1:D8:3F:25:81:07:EB:9D:ED:04:77:B3:57:C9:46:FF
-      Public key's random art:
-      +--[ RSA 2048]----+
-      |            .  . |
-      |           . +o o|
-      |        . . = +==|
-      |     . . . + *.**|
-      |      o S . = +.E|
-      |       . o   . =.|
-      |              o .|
-      |               . |
-      |                 |
-      +-----------------+
-      
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 078eb0f..131989d 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -37,7 +37,7 @@ openvpn:
   configuration: 
     auth: SHA1
     cipher: AES-128-CBC
-    fragment: 1400
+    fragment: 1500
     keepalive: "10 30"
     tls-cipher: DHE-RSA-AES128-SHA
     tun-ipv6: true
@@ -54,8 +54,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: user_service
 services: 
   - openvpn
@@ -77,11 +77,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 06d1410..c7ff3ca 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -37,7 +37,7 @@ openvpn:
   configuration: 
     auth: SHA1
     cipher: AES-128-CBC
-    fragment: 1400
+    fragment: 1500
     keepalive: "10 30"
     tls-cipher: DHE-RSA-AES128-SHA
     tun-ipv6: true
@@ -54,8 +54,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: user_service
 services: 
   - openvpn
@@ -78,11 +78,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index d776c55..dd0be4a 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -86,8 +86,8 @@ mail:
     - leech.demo.bitmask.net
 name: thrips
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_service
 services: 
   - couchdb
@@ -117,11 +117,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 1f4e697..2296cb2 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -69,7 +69,6 @@ definition_files:
         "openvpn_configuration": {
           "auth": "SHA1",
           "cipher": "AES-128-CBC",
-          "fragment": 1400,
           "keepalive": "10 30",
           "tls-cipher": "DHE-RSA-AES128-SHA",
           "tun-ipv6": true
@@ -229,8 +228,8 @@ nickserver:
   domain: nicknym.demo.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_service
 services: 
   - webapp
@@ -252,11 +251,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -335,6 +334,10 @@ webapp:
   client_version: 
     max: ~
     min: "0.7"
+  couchdb_admin_user: 
+    password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
+    salt: e1dca99375c513be477295f141b9f032
+    username: admin
   couchdb_webapp_user: 
     password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg
     salt: c632af58769857bcdf108b46da9eaa44
@@ -589,180 +592,92 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFVjCCBD6gAwIBAgIRAPGZlQuiI9dHNEOp2GjMTKYwDQYJKoZIhvcNAQELBQAw
-      gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-      BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-      VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-      Q0EwHhcNMTQwNDA5MDAwMDAwWhcNMTUwNDA5MjM1OTU5WjBUMSEwHwYDVQQLExhE
-      b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRkw
-      FwYDVQQDExBkZW1vLmJpdG1hc2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-      MIIBCgKCAQEAw/DshBrsWt+G2YDZ4GBTcFX3JR+InVNgyXnDBF1DNKVVVI/BjEi9
-      fIeXWGPRU3FW5Y+CLDBrp0d6qpGX8QCj8hFlSmBg4bXAoAT+e6KlWsAFCwmZ1q0d
-      KuBW95ifojkM+NVeASLLcHuy0FshW+c9SgpArE2c0KHT2F67A7FsXuAQkPhPZApT
-      n1OC/Os4I3uLZlRYv75BEPPk3zoysSagWCTASnDaImq/sw0AWEn+cdLXfkkOPE4K
-      03yGBCFmlhwpiqSwYO6MmvdWQGAzXUl5Qt934LZ2S8Si52BKGiIMhcHMfa77hSuJ
-      VDRCxng6zco6N9itRgAzXuptg77qX85CBQIDAQABo4IB5DCCAeAwHwYDVR0jBBgw
-      FoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYEFIaP42OJJm1RiI5NIyUr
-      3JYoNtQsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-      CCsGAQUFBwMBBggrBgEFBQcDAjBQBgNVHSAESTBHMDsGDCsGAQQBsjEBAgEDBDAr
-      MCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8ubmV0L0NQUzAIBgZn
-      gQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-      Q09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNybDCBhQYI
-      KwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9kb2NhLmNv
-      bS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCQG
-      CCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wMQYDVR0RBCowKIIQ
-      ZGVtby5iaXRtYXNrLm5ldIIUd3d3LmRlbW8uYml0bWFzay5uZXQwDQYJKoZIhvcN
-      AQELBQADggEBACkazAUnzL6F3loFc7qg61ZThtUwjAnPuUEHSjUev3vkIjz6mj14
-      Wwvoviz0xGYzqVZr70oEDQX8dkfpKByIYadWlewsQOTg4jIOVs+1GcP3TsEfniPu
-      bIdKOLVe0o1ubTlQ+pitHkH3k35Jgua/k5WhCcg5oWe4wbo8hAioQMRMnbVOUuI6
-      rvhPFH6mEyYwOF3nvJlgGcOLvfZGSiVc86uhOqaF42DU8UBdX1nmMghSX8VeV7TL
-      8K05UR2hUBrorxeJHiM6q4WlcrZLpVwKwqZmSeaa8ARvbQ7RllQO+0FcfVClXdZl
-      NHKdhoaxwQfZa+4mrb2dsr1jyAh08B1UqIM=
+      MIIGVDCCBTygAwIBAgIQTs4jNfKb8/YyxYBtUZPQMDANBgkqhkiG9w0BAQsFADCB
+      kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+      A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
+      BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+      QTAeFw0xNTA0MDIwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMFQxITAfBgNVBAsTGERv
+      bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxGTAX
+      BgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+      ggIKAoICAQDwvMa2z8biMMCkq9whwuVG9pRQn3ebohFGcyOa4c7PDqFHwTVCDmK4
+      8Bq/7w2PC+meQ5NV1Bm6GwWYB9qpRcrmM7VM69Ee8ttp4rKnCk11EO8cktvvP+Ea
+      kKkdaXxLI0BKPzl5RJaFfb4xggHL96cN65ZcVDW+ghloKGsZxwTOQOUfBMksgPQR
+      pO3XzM5BDlWm122gKyRQPWMoXoTOWDmbzydX2sgpZ9jxoMbzAQ9JB7Vjwoz0lqj8
+      94ckXFLDV7qdYWfJHyQNERCqa1rCovIFk61HbCqutfKw//atiAw1NinBUAa2em2i
+      PdKYWpubTAGeZ4MWzgpwg9+5ynUDf3p1XXNAH3R97Y957IPTdAqR4dwShG//xIL7
+      PQUL9csZadMfzlln9rjpNhRTfWiNkB3TA4mUhzvpmpJSp+b6xYpkYgxNQOoscAvk
+      Sz2pUkJFmDXrBnbz8cRD8mD4NRxgif3fEPce3kT97BoDyXL1mX2Hd2nVF2ayjfTQ
+      ZwVjLpV/Hw/MYwJdjxckUVRYHaBbF5i3EbERhtBEOemoHN9hhoiu7nFw7xvu9CuA
+      F3OqoM6E3PDbUDq++XLkpDvdlAscF+RZf9fdhGfe4GmBm72iKHb3e3N4xpQp1Phy
+      OazAFPC0eYoCmDnozL+tkT1guW9gFZ417ho2TggKqu/w7xyuFHxQ7QIDAQABo4IB
+      4zCCAd8wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYE
+      FMOFwfy0IZteBeE2q8oMNaiAvn/AMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+      AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoG
+      CysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9k
+      by5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vY3Js
+      LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2Vy
+      dmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9j
+      cnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVT
+      ZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNv
+      bTAxBgNVHREEKjAoghBkZW1vLmJpdG1hc2submV0ghR3d3cuZGVtby5iaXRtYXNr
+      Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAHzH0R7oXFBzVMCTzxnuU7wHRwIp08w24
+      kjSVzEm31jBHfeq4Eg03Gg9nu4TcGzRvUisziKjq9Ew9OuoQAerqmlL4WyrX5bfH
+      eBdn8qTebTVktqyQXyfI2uOsYmPK+tL97gbCoMMdGirrbi52Wg3HX+J6IP9lZ9iP
+      DStF46CjJaRNRib6J1XSuFPQ3Lf5Ae1RcvSSsZ1nOPnrhW7X7TKbl6sAku1VagfE
+      OEFYUxn2E3rB5wRwaG+SS87nNehMocPqdueW2bTd+f1dVwbhaCjjmB/piD3i5Jy1
+      /4rWOSQXA8zMEpmUOar4WBIEQfkrfTC2zbCyaHmOa+3glxQDeA98oQ==
       -----END CERTIFICATE-----
   commercial_key: |
-      Public Key Info:
-      	Public Key Algorithm: RSA
-      	Key Security Level: Legacy (2048 bits)
-      
-      modulus:
-      	00:c3:f0:ec:84:1a:ec:5a:df:86:d9:80:d9:e0:60:
-      	53:70:55:f7:25:1f:88:9d:53:60:c9:79:c3:04:5d:
-      	43:34:a5:55:54:8f:c1:8c:48:bd:7c:87:97:58:63:
-      	d1:53:71:56:e5:8f:82:2c:30:6b:a7:47:7a:aa:91:
-      	97:f1:00:a3:f2:11:65:4a:60:60:e1:b5:c0:a0:04:
-      	fe:7b:a2:a5:5a:c0:05:0b:09:99:d6:ad:1d:2a:e0:
-      	56:f7:98:9f:a2:39:0c:f8:d5:5e:01:22:cb:70:7b:
-      	b2:d0:5b:21:5b:e7:3d:4a:0a:40:ac:4d:9c:d0:a1:
-      	d3:d8:5e:bb:03:b1:6c:5e:e0:10:90:f8:4f:64:0a:
-      	53:9f:53:82:fc:eb:38:23:7b:8b:66:54:58:bf:be:
-      	41:10:f3:e4:df:3a:32:b1:26:a0:58:24:c0:4a:70:
-      	da:22:6a:bf:b3:0d:00:58:49:fe:71:d2:d7:7e:49:
-      	0e:3c:4e:0a:d3:7c:86:04:21:66:96:1c:29:8a:a4:
-      	b0:60:ee:8c:9a:f7:56:40:60:33:5d:49:79:42:df:
-      	77:e0:b6:76:4b:c4:a2:e7:60:4a:1a:22:0c:85:c1:
-      	cc:7d:ae:fb:85:2b:89:54:34:42:c6:78:3a:cd:ca:
-      	3a:37:d8:ad:46:00:33:5e:ea:6d:83:be:ea:5f:ce:
-      	42:05:
-      
-      public exponent:
-      	01:00:01:
-      
-      private exponent:
-      	3d:07:00:e3:74:6f:41:2e:75:95:b0:e8:2b:56:55:
-      	26:9b:df:ca:14:34:3c:ac:07:6d:39:1b:60:74:9b:
-      	c5:fd:e8:c1:d9:b4:72:b9:05:2b:90:1f:b7:4b:ff:
-      	9a:79:a6:93:01:4b:8d:ef:d6:d7:d7:0f:81:a8:af:
-      	26:45:08:cb:10:57:f7:fe:64:ae:68:29:82:ad:8b:
-      	85:7e:76:f9:f8:ec:99:2f:78:56:c0:bc:60:ea:56:
-      	ab:ef:41:69:09:53:dc:fc:b7:b6:aa:db:aa:41:1c:
-      	c4:80:5d:b7:7e:22:3c:b9:4c:c3:5d:b9:05:d2:21:
-      	65:36:bc:10:be:65:fe:76:46:d4:e1:d9:b5:e6:18:
-      	42:d4:77:d8:4b:95:5c:31:b6:71:57:df:e5:56:7b:
-      	73:8e:61:b8:49:68:c6:aa:12:40:78:6a:c5:6a:c7:
-      	11:3a:e2:51:6d:e7:5d:fd:64:f4:8f:92:e8:ec:c9:
-      	aa:29:5b:22:e8:e3:99:a5:82:38:45:5d:bd:2d:75:
-      	a1:b3:4f:d5:8e:5e:20:58:be:1a:5e:84:24:1c:26:
-      	c8:3b:4a:89:b2:ec:e2:77:20:04:58:35:4e:b6:a9:
-      	cb:fa:f7:16:3b:b1:c3:cc:e0:47:2f:90:dc:5e:a2:
-      	48:4f:1c:33:05:57:e5:84:fb:89:3a:d1:98:6d:d4:
-      	d1:
-      
-      prime1:
-      	00:fa:1f:a7:8e:91:19:68:b8:77:01:c7:f7:a8:7d:
-      	f5:9a:b5:c9:af:35:85:0e:ab:8d:9e:d4:43:39:d5:
-      	81:98:0f:8e:49:64:1e:49:a2:ae:2b:7f:0c:3b:90:
-      	6d:41:93:e2:2e:1c:fd:f1:9b:ab:da:cd:8b:11:53:
-      	f8:c7:d9:5b:dc:02:df:54:4f:ca:1e:b2:bd:ab:76:
-      	40:b2:4b:ac:dd:89:6e:78:e7:ff:74:b1:ab:4f:24:
-      	ce:22:f0:44:96:dd:cb:fd:ac:ef:55:70:41:44:59:
-      	1e:e2:fd:31:72:17:39:a4:c1:77:25:ce:01:33:70:
-      	fe:5e:50:8d:b8:12:84:35:7f:
-      
-      prime2:
-      	00:c8:8b:64:bc:b6:a6:4a:f5:8d:0e:b7:97:a2:9c:
-      	c1:74:70:59:7b:c5:d7:76:65:7a:12:ca:0f:63:cf:
-      	eb:8e:18:98:54:83:39:5f:f0:08:fc:ff:46:70:a7:
-      	18:0c:41:90:72:e4:95:46:94:74:91:e5:15:71:a5:
-      	75:93:c7:57:6d:f4:ca:fe:44:19:86:20:6f:32:e8:
-      	56:67:e5:75:18:81:80:82:e7:a1:d9:f5:3b:b5:84:
-      	6a:16:c4:06:2c:93:b1:79:7f:c5:2d:c4:69:be:23:
-      	af:6f:49:74:3b:ff:29:82:29:5b:9a:67:ac:30:34:
-      	31:c7:15:36:94:3c:8a:72:7b:
-      
-      coefficient:
-      	55:e3:29:4f:ac:ce:af:f0:7d:d3:0a:7e:7e:61:51:
-      	f3:02:51:0e:25:3f:eb:78:a6:04:5f:12:04:60:72:
-      	da:bb:67:6b:40:60:31:c6:dc:e6:ce:b3:3f:9d:f7:
-      	9e:8f:fa:c2:6d:6c:a1:84:1c:9e:9e:c8:75:a7:c1:
-      	e9:82:24:45:97:ea:37:41:f1:3e:6a:62:29:7c:9c:
-      	71:10:f8:e3:7c:92:92:d7:59:41:2c:02:2f:fe:85:
-      	3f:13:3f:d1:c4:42:e5:83:f7:f4:29:d1:26:09:36:
-      	23:31:90:b9:8a:8b:76:47:66:df:7f:3f:87:9b:6f:
-      	04:e3:1d:13:a0:dd:fb:63:
-      
-      exp1:
-      	00:ed:89:68:58:35:a6:7a:d4:4c:78:cd:8e:7e:5e:
-      	79:04:1f:46:55:75:af:52:5a:4b:d9:9d:dd:e6:2b:
-      	c4:b2:43:7b:ae:69:3d:76:52:df:b3:81:29:7d:db:
-      	d0:56:a9:f9:f0:2f:2a:5f:ec:a6:0d:da:8c:0a:bd:
-      	c3:93:0f:f2:74:03:ea:52:28:a0:5b:fd:05:b1:b3:
-      	51:07:c2:64:7d:d3:c9:ad:5b:2e:38:85:8e:9a:4f:
-      	ea:d0:35:7b:fe:06:cf:76:af:68:6f:ac:76:df:50:
-      	ff:cb:34:07:64:41:78:45:e6:51:9f:fe:7f:17:7a:
-      	64:a7:ef:3a:57:a8:86:14:43:
-      
-      exp2:
-      	60:d3:3c:6e:08:d9:bd:33:55:49:97:c6:b4:92:6e:
-      	ac:e3:59:b0:f2:d2:96:ad:64:05:12:5d:df:d9:11:
-      	67:e7:e4:14:59:cf:27:cc:e2:ea:13:ee:54:91:b8:
-      	80:a2:5f:35:b9:bb:80:fa:48:55:f0:7f:2c:01:b1:
-      	05:0a:a7:e1:c4:e1:05:66:a7:d4:24:70:cb:e9:75:
-      	5e:70:60:da:d6:1b:d0:18:3a:02:db:ee:5a:33:76:
-      	6d:4b:73:97:ae:2f:6f:f4:0a:a5:90:41:65:b6:21:
-      	0b:e0:31:28:8e:87:e1:fa:49:ea:00:c8:17:f5:fb:
-      	5a:9d:99:5e:74:e4:7b:65:
-      
-      
-      Public Key ID: 33:C2:75:BD:B1:D8:3F:25:81:07:EB:9D:ED:04:77:B3:57:C9:46:FF
-      Public key's random art:
-      +--[ RSA 2048]----+
-      |            .  . |
-      |           . +o o|
-      |        . . = +==|
-      |     . . . + *.**|
-      |      o S . = +.E|
-      |       . o   . =.|
-      |              o .|
-      |               . |
-      |                 |
-      +-----------------+
-      
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----