recompile local

author: elijah <elijah@riseup.net> 2015-04-09 08:06:46 -0700
committer: elijah <elijah@riseup.net> 2015-04-09 08:06:46 -0700
commit: f618f7104bd155f6fe7c90f9e6a9d7522c7b3a1f (patch)
tree: 2f2a0405889cac17a04022c1741812616bb525a7 /hiera
parent: c13f44667f87f1eb1982dbc9d2acb111ca9af754 (diff)
8 files changed, 749 insertions, 831 deletions
diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml
index eb42acd..2ed53d3 100644
--- a/hiera/couch1.yaml
+++ b/hiera/couch1.yaml
@@ -77,8 +77,8 @@ mail:
     - mx1.bitmask.net
 name: couch1
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_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
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
@@ -214,62 +214,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEozCCAougAwIBAgIQI7GpnNpQnBDoUoNF+SMBmjANBgkqhkiG9w0BAQsFADBK
+      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
-      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
+      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
+      E/pmwVKBiw==
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml
index d2e5d95..2d21f49 100644
--- a/hiera/couch2.yaml
+++ b/hiera/couch2.yaml
@@ -77,8 +77,8 @@ mail:
     - mx1.bitmask.net
 name: couch2
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_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
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
@@ -214,62 +214,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTUwNDA4MDAwMDAwWhcNMTYw
+      NDA4MDAwMDAwWjAdMRswGQYDVQQDDBJjb3VjaDIuYml0bWFzay5uZXQwggIiMA0G
+      CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYY2WqriFA/LUyaNQDFQOOKwVPgL78
+      1IhwveClCBD8IcKOsJjo0UlKJZGU+4jFIozpCfPJKmNTo3jARvtlSXpyvW+HKftk
+      saScIzvuur6cqhpT/oT/oXM4LtAfQv573DPP+LO3lmMXkuivpEBzdJ/RHJjoxse1
+      OFsnQxnhy8juMqZVD+qdVUm6FnpIdQTcGdKjRbH8zN6cTygOLPnwH6Yy+SG6haEX
+      z7N8kakbXbff+fwdHWtzVOVtBQeSGm87eKddyJ4vWnO6AK5wjv94MmUroRQjLckL
+      KIdHwwjRxa4eH8OZ3Xb5ziomFCryOCVU8jMqa5pFbvvLXpPRhaat1pLfDCOYps5o
+      8WPQh261MK+thSCL3L3jOmw/hbTGodxFVYndlN6dfSXIEcI4wrUpokyTYdBq2fV5
+      jnCqO0tqqD3qSUHnnSW8DYEXjvhdYm/iYP9dNeakxm2sAf87NP1qCVJyTmPvi2rg
+      2t4E3KeQkkgEd2fF88aEHKuuatZMOK3BAZNfWrZm2decDa3PN3M4IaryZrUH9jwn
+      YCX4MHj6Vliuf62XnnBnIsXvKTj1z6WOvMU6I8YJmgv4ngvGPz/x4RxUfDYNAXUf
+      Kgj3vKNI/s1CMRyZJDmmKHMj/zJDjJ85yk3NdU5UOWQTlqdOp2W1Tbbu8wcBspC4
+      8l67eE6VgCQ5WwIDAQABo4GxMIGuMB0GA1UdDgQWBBQGodbOL6xONwBg2kTylrUc
+      qyjRpDA1BgNVHREELjAsghBjb3VjaDIuYml0bWFzay5pghJjb3VjaDIuYml0bWFz
+      ay5uZXSHBAoFBTQwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+      BgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSV
+      Pg+PMA0GCSqGSIb3DQEBCwUAA4ICAQAcjVVAOWOgyhZZ+sNB3+pMa83QdFwVhtRR
+      gFr/BL7edNGJJsnPSBuiLbNDPucIEcfwsfVCnV8fGspENdnApdjR1butq6JxEagR
+      c9gDUAl5sScAiJbJv+cWOEnx0iKFOzSc1itdSNpl+4ci63/Wa1S0c710hH4/UZHe
+      zDHcDRpZD+R1Kdn4tKevLWl1RbS2CRmFdgvOB0HadWUqxjsxVpAH2wH8C6/nkxiZ
+      M/Uv8N/2fm/ynh0Ju0btHkKODk4VqnNYGhabG1qcsMRUCA4nu0lpgoX7z3o1F7zc
+      xxO9kWJilFm3XQ0umoO3t1MVufMVN4qgpiTo46gQHLAe+8jCytL0Z52i7MEEENL/
+      FYw/I3esMH/PfLLQcr5XSKST0FRnfzQ8QLO04/iAck2ZfBaABw0LbFS5KufoVDRJ
+      T0jBhhlgCMGL1c4Or8F6L5d/y8VxMk+JhKhu23WZtrmMt3IyfIDt3gApncDgni2/
+      aIHuF1Ue3qEvzaAZq2VIcvg+k5aX4pk50WSt4CAp/pN6CIozhM9oonhE4UdkmeKt
+      bspKgeUOii9BOFZpxwarmsYxyVlmgEVloWNqTOPij7F56fyWVCmInfgOwc9tEFFw
+      BG3orrVZHO/XLkmmhf2jmYEJ/GfQKPUCRdA7558443Tvfdro2u9YeJHBvTwD87am
+      po3MYeeWXw==
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml
index efba894..cb03ddb 100644
--- a/hiera/monitor1.yaml
+++ b/hiera/monitor1.yaml
@@ -144,8 +144,8 @@ nagios:
   nagiosadmin_pw: Y_uRtQby7LtwXxFRhIv_qVVrwWHzYrQq
 name: monitor1
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: internal_service
 services: 
   - monitor
@@ -167,11 +167,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
 squid_deb_proxy_client: true
@@ -262,31 +262,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      VNEW/yvsCH7IS9KuQoI=
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -444,208 +450,144 @@ x509:
       -----END CERTIFICATE-----
   commercial_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-----
   commercial_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-----
-      MIIEowIBAAKCAQEAnZZfc+whHgfwz5ubBaw5VZCRjKP1z4VyTTH40uqjg+KO3Adh
-      31eRirnyWYG8HFpEOkPuHj+G5PW4WMzd5VpwJPtV2fhaPYU7/yPnWo3uDN8aVIHn
-      1hWIAsYfIdRoE2p2fJNisOMFoaN0X/HSo0ZN4dpn5GzVb1JqAemBPWQRwCB2XSzm
-      eGl8qGVRKsFEAtSJEsK3Tj6ft201De4sSRNwtl86MCzmpMgIzlpWZXcDkmw3HAZB
-      e1RsFOxzhbx9TLvDdYYCiXZYTVOwVmmwL9pvBd8Jj1ce7Fk3CMWeMNjtfPqIHiTA
-      Jh0KXOQoATbbsqrIL972xIIUrzDslCXRrlbIYwIDAQABAoIBAG/8KCDMsEwTAIHH
-      5kYFuUigz43OBiROhIdu94+KxmA2Y6bgaCC6reaTdTE+DFtpmgp9s30zT7ztEO+p
-      xhXySrc9FCktX5NQVu5cqU+khIIJGUDsf7+W1WyDNiRoOP1zLngglIV3Ds1qxoxX
-      4IO+tiHFfwbIgHP3cPWi5gCmWCbazUo0l+KIjqDPYAvM9NYRD2A4W2YCKttaxh/K
-      uujwJFy00tWDd4WrfHDQs/js/NlFm/g2b+/0oUrV90EBorHdn6HnqJ8Bwj2V3scF
-      Dvg1xn0d9huXNQ2VsKoi+mJX6c+eVSo3epqcAJWgjRmePJQt1SoOBAc0wypc9QIL
-      rQouweECgYEAyCGIA+niBrdBQVervtHWKBFJC3uK+OM+m4fedn8qyNXpG/x2f+BT
-      x8l43VYyZAQAe5+t3l8VIB68TgupCPxTIYAWeo080gatMM5q4OA+KfIbszUhAvYH
-      1YxGSblCo97KJPncP5uYOvTaEzQK53I8LFF9vdx32n8WeUIhkOsA+Q8CgYEAyZRw
-      6sjs54ssi1UoB7x+YcpPadNf8M7rBivuGTIidCK5nzvKjukGU7qOjcjsxgtAisuk
-      C5Cq8MK4MXzXbiNrrkCXu3y6c76A4ClGNtIq+cEWdETPcjyTIggNwwjpWvf2iLF7
-      rzWAPcCkgZVfBNbE4VmDmWcUQzUjRVme2hJFc20CgYEApMKGOcKY5DKGNIc6y3Px
-      PTdNzXg+JzzeVCj9SszSqlkA+ptT618BWl9Rc9b80T5CL4R8HbBlsfXbzNzooo8o
-      2VGcL/SK99WrS50EfHHge6PojhbVQJzQQkyjqRot9L776IkTfAJax17BEkIsH/L5
-      +vpz7JTOz0EFfXqmK6ptOJ0CgYAoXr8idizjzj6UhPBoZDqXURIIapmrO3VcHg4o
-      I588zPuJxUqyxj5LJHCKOrQYkYZShagL3OQvJYAIAS2P1C4rjqoUlU0uAvgCbKGw
-      NvT+YcoibOlywmjhBuXiqnU5j7Fi/NB9bWSKeXs4rHaEHJL/YpL1dOxc7VZr/B/R
-      IpmgHQKBgBlKTkKea4Qhv6bV2pq1h8h0Ev4GRHw6PNPCieTOKvYgI0y9aRqspNBm
-      PsnCqxRwrltnMWWP6XbKw+t83L11nPY/Gip3IOWMxq9k4alRzGF2GEY4tzfNrHRo
-      VyqaNj5BDZhQqzUC50VRXGriLzaM+gUyZv7WdDIVjtGCM/5sJYcc
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 08b2888..c40c57e 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -92,8 +92,8 @@ mynetworks:
   - "85.17.92.143"
 name: mx1
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: user_service
 services: 
   - mx
@@ -115,11 +115,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
 squid_deb_proxy_client: true
@@ -211,31 +211,36 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      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
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -393,208 +398,144 @@ x509:
       -----END CERTIFICATE-----
   commercial_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-----
   commercial_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-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml
index 00780c6..525210d 100644
--- a/hiera/plain1.yaml
+++ b/hiera/plain1.yaml
@@ -21,8 +21,8 @@ mail:
     - mx1.bitmask.net
 name: plain1
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: internal_service
 services: []
 sources: 
@@ -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
 squid_deb_proxy_client: true
diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml
index bd83888..e58dd25 100644
--- a/hiera/tor1.yaml
+++ b/hiera/tor1.yaml
@@ -21,8 +21,8 @@ mail:
     - mx1.bitmask.net
 name: tor1
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: internal_service
 services: 
   - tor
@@ -44,11 +44,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
 squid_deb_proxy_client: true
@@ -141,62 +141,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEnTCCAoWgAwIBAgIQKtdICTS4YnyX66ld9q+URzANBgkqhkiG9w0BAQsFADBK
+      MIIFnTCCA4WgAwIBAgIQX0mqxT0rx+QAYZCJwBOeqDANBgkqhkiG9w0BAQsFADBK
       MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      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
+      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
+      kQ==
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml
index 7a163b4..59ea441 100644
--- a/hiera/vpn1.yaml
+++ b/hiera/vpn1.yaml
@@ -33,7 +33,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
@@ -51,8 +51,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
@@ -74,11 +74,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
 squid_deb_proxy_client: true
@@ -161,31 +161,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      JQ==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -238,31 +244,55 @@ x509:
       -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/web1.yaml b/hiera/web1.yaml
index 6f2992c..e8ad765 100644
--- a/hiera/web1.yaml
+++ b/hiera/web1.yaml
@@ -35,7 +35,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
@@ -184,8 +183,8 @@ nickserver:
   domain: nicknym.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
@@ -207,11 +206,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
 squid_deb_proxy_client: true
@@ -290,6 +289,10 @@ webapp:
   client_version: 
     max: ~
     min: "0.7"
+  couchdb_admin_user: 
+    password: _Bn6AqU54shspQxbnsQTpRySjLQKTjBh
+    salt: 3195fb6efdbf4b4825026116d5aaabfe
+    username: admin
   couchdb_webapp_user: 
     password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9
     salt: 7e8868f8c4775290fd37d2f520d13672
@@ -543,180 +546,92 @@ x509:
       -----END CERTIFICATE-----
   commercial_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-----
   commercial_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-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
author	elijah <elijah@riseup.net>	2015-04-09 08:06:46 -0700
committer	elijah <elijah@riseup.net>	2015-04-09 08:06:46 -0700
commit	f618f7104bd155f6fe7c90f9e6a9d7522c7b3a1f (patch)
tree	2f2a0405889cac17a04022c1741812616bb525a7 /hiera
parent	c13f44667f87f1eb1982dbc9d2acb111ca9af754 (diff)