1 files changed, 83 insertions, 53 deletions
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-----
-      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
+      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
-      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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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
+      MIIJKAIBAAKCAgEAoobu+sr0S+2FCRtspKQFLkU4yXHSVWFXmecssuTG+g+04uAj
+      8NNUA/lyI/oKerQ/tYYLcnSTS6fRXRv9b6T2Rk/Yy9/c68jYSfDYdyZzsNhJvqGt
+      PcNEie10r+lfUDVP13n2rAiDIBOi0bPWQO9jlN2RjrP/79sBWYj+U1sUZhpBis5j
+      cPYB9yBm7PyiOtDV2EvQs4gBXycBBAf22DraSA9egjYx3nmo+h3ikKfnglvdvH2c
+      y/617o0BtymUck6T5MDQ52H6thGBBqZXdFzz2/iayfnecg+9q21bb6zo0t70+AI4
+      O5dreJkTooDM8B1y6wMZNe+5ojZd5IUM2KH6l0Ff69DKoJ15S27+2DnGbTegftw9
+      Ni+Q4G+4ukzLlkd06dyx5EJTrWdVSffuo9YFg3axbKXZRZ2ZJ5hmxD9UKMCnSSMZ
+      fmEagvyyPFu4yIamSEM37vIprhONBY/WGC72AgBTRqh4oRG2ziDlQpYULCjtNQ1B
+      Gh/kZj2KulHPxzVQVD+7ObwZUYNXPh6ePfgqiLrzQLDWQCQ55eVSNtgAfiVD8xC1
+      c4UeKsy03L/IW4+rcECkn3Ko3HuQo2DCKp7XBRMpueqzPRLk9km+8eEXD9lV6jeJ
+      gh0zDtDavK4t2aYfYdhuu6REbWDbdHmrceCkEk8NA0TQqzVMpiafWI9PxwMCAwEA
+      AQKCAgACj8/qghJxs++54gXHXpJ6VTr86d9f2yXvVhZ9R1/fhynZvaCzZhFX8rGa
+      4ZESuA6dBNzfU/kSYzXImu1Wuinrl8yaAhBQYx0NpU80KZX/PpmC+LdrVs2YwvZo
+      42vOLtjwU4rQ0V2Hvud9GLGS2nMeYJOvxSSOmkweJiukErZymY1Y68HjgO0tAQS+
+      TYkdFjeYrjE+8zDaWBoK/zkj1WGlayCZOtN0Z0SDlL8CerMKefo3w18aVAx4Ex7o
+      zS3600Q/gc6JJyE1h3caLLsKKYDqgbOm5VpdP+REdHfRfc85q6v+0MIkJlHaV8dY
+      c2FHk59BFw5prDqn1OWL+ZDnRT5W55E+t3BjXi13AOlrgG2e8cQcgSyRhZaiAkny
+      OPDM8DHKOrSW3pvw4JkFPCamTepYdgiwvt5OROUH/TgrCn1p3JhKXngGBvbke6g5
+      7jw5N4cqATRBrKBJwvOk1LRWwabi+nhoRyKpkbFvNa7ogU5AAqrgtkyZfvuiJdeI
+      V6mqwnlTqlB2H381XnSQVU3BEGIAJx8+2FyLNljX50koOTooHNz1TjUgyhg+6n6m
+      KOvxU9+YRl/5ecQWSOJBq9JewDKvnhB1A/LtympbqeWVPfdrXYODrCYKVDHs0aqY
+      J90ARTmmq7Z1s1ObzDGkqrqHGF68UNrUlaZCg+CE3xVtCHWV2QKCAQEA0PrgVRrz
+      pdGuXGW3b1aM3aQfm1YSbIZil3uXVtjQqtCibSBOhX6QxEkS2S7D54HEuquzm/NN
+      0WyUdBXFsch+NuxCjM7xGg4g/ndDHRWULw4aZlwsxVx3262TpKF8OMY14rG341Op
+      kLoMHicl28hjLT6+HPyWHjyWOVn26ipqle8PDxlBZYrrbPxNpcp4JgwRrn6HIVtC
+      s4SWjVAmEEDLCQb9dz8OEpoPe6+7VOsqgSWzUCTzVETYC6q54q6GtHaSMTinb2h3
+      UjiTgpKo7hpgIN17UqnBpDj4jLioNVyV7f6zOU2gWvJx1U8MAXi1m2x+yQxuwLkY
+      zThFrkyPQxSTJwKCAQEAxxhlxMSKYUSwD8Rk+rtepQ/iCGGjmV5a69Pu8jmt0nyF
+      w6AQXDqZKGa2NdNW/nZE9boxGALt1cPGYP5nttG2bm60nh/NttX/uCs3FfTfpg8/
+      3MsvPubjolX1LZRm7hjXbVWJ7U5tIZM1tuFBmaTsMbwAMCDhSnuq+R4hh11jhtL8
+      a1XHxn1VEiivFHAOpX68KRrGDIi5z9upBfbJj2Ym1pUkZY9tUonN0AM7yv5Whf3l
+      GBaiBbeFT8uBY009rBCyI5iUfMr1/hiqFmo0vUsp6dEbdis4HLlm6NUNK/QsnaFT
+      1CF/9H0SpDitxHqlvnGk+PSTZ+ECos4OyYkHxv9mxQKCAQBKYWDDKcqatFzY6iM1
+      75pHsQjG4wW/tr0UqZqeAKGUipmlOaB5BylDk7avsmNr3NZGkqJk2V5TMdBM2Qr6
+      UiAKMGEneOh7m5fGunAaw/lwHhbrY9dTj6vhdpBcQlXSZ0n6m8KVmMt7hZyWhtyE
+      s3gJPJGyA3zy2iGl3A10HxC8uM+lUhniqGVO7yY74iqNcDJC5yn1h2PgPUrQlTxX
+      AJjDZ8eDT+AUYt0r6spEWUdRnDeMSPqKfc5fqK5sri2nwaQa/M0rbAU8MILgMI8L
+      4DtitzITo/QWHWjpvTexdniusr7boHN4q140y+O8ClipLx6ZNGGfGsJnGKZEeV9s
+      QsB1AoIBAEUgqH04jJ+XPNZMp48TLZp8OEwWsroWs9T8IhQCiOLzj3JMCkIrqnAH
+      sa5gsezqXalAO7mNkszNC/0zeAlXKVOQpq/cdQ3NodttTdQW0OyUkOT1u3LIsjL0
+      S4vG4jI7d9kjgR9fQq8MsPLNpXxWchgWoa4UTIUTCVsz5gpdF6iBa1lNUG8Pp1EF
+      xTyAZ+V4apaPEELb2kBckYRbmsJqgoOxBxEoSpoE9OwLo2ApDRu6+ydw/FKl1OjO
+      zR8Qe6BZr7CCUtQ9mEnggHYF7EfpaCUiELnn6bS3fw7KoqcnQbJ9iGC4PPhD0Qwq
+      DdORjijgxpoWOXQxATxL9YBuTr/+f80CggEBALi3SKIx9d/GY56HpK325ykaY2Es
+      iIS3PznTSG/30zFPZJVBzYGDU5AkYRR3SOGmPqIWHYtYsztBJ9PFfuVpCQ5vX9rE
+      OewMxxC4lEc7bLVGm8lOHmlij9q0EBo0YkoQYzm3JvzyIhzm7+0taO1cxTSFPwvN
+      XJS4C1/NJ2KztOAz9QUZ+9zjTy+qWWq7lxHWO5vf/xSxtplnP8a8H4gGMLNWzRxt
+      6579f99JwgnhL8OQZ4qR/yytBTCv9NNJ5nztxF1rBKrLETP3gaIFLHhXs/0+l5NH
+      ZsbOXIXHjpustx/b+lsTupJxhD4St8V+54wMLOWKb2BAl0hKatyNo+YLp5g=
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false