1 files changed, 81 insertions, 77 deletions
diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml
index 0c42cd3..5f990f1 100644
--- a/hiera/chipmonk.yaml
+++ b/hiera/chipmonk.yaml
@@ -89,35 +89,10 @@ mynetworks:
 name: chipmonk
 platform: 
   major_version: "0.6"
-  version: "0.6.1"
+  version: "0.6"
 service_type: user_service
 services: 
   - mx
-sources: 
-  apt: 
-    backports: "http://http.debian.net/debian/"
-    basic: "http://http.debian.net/debian/"
-    security: "http://security.debian.org/"
-  leap-mx: 
-    package: leap-mx
-    revision: latest
-    type: apt
-  nickserver: 
-    revision: origin/master
-    source: "https://leap.se/git/nickserver"
-    type: git
-  soledad: 
-    package: soledad-server
-    revision: latest
-    type: apt
-  tapicero: 
-    revision: origin/version/0.6.1
-    source: "https://leap.se/git/tapicero"
-    type: git
-  webapp: 
-    revision: origin/version/0.6
-    source: "https://leap.se/git/leap_web"
-    type: git
 ssh: 
   authorized_keys: 
     azul: 
@@ -202,32 +177,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEuTCCAqGgAwIBAgIRAJnWkr7iZNOlulhK5BVBBYQwDQYJKoZIhvcNAQELBQAw
-      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MDQwODAwMDAwMFoXDTE1
-      MDQwODAwMDAwMFowJDEiMCAGA1UEAwwZY2hpcG1vbmsuY2Rldi5iaXRtYXNrLm5l
-      dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKAcY30dyWjo75OLnIp
-      Hq5w2KUA7O2cE4VCTt4kX0Y+kENRYciiERYn23T8kkjyjzmgVODAfL/4DYhFnJdL
-      PBs160Sh2FdsBNNZ+SiBNNvKTARdKqzbBAh/EYLBSlx3T7nK0Bf2/4wRdLL2W6JT
-      tDseSzIPPculsQbjkfnwxr513OhI2zndg/8F8ojqLUipc4f7ZjmHDuAnVoaIOeZr
-      zXKXwF0xIKzq9yyPopZ3S7CzJuACdgEhOlxVlHk+T/HhDoHq7Sd+MYofg7pB2xUx
-      QPA93qRkn7VYegu7AsbXMzgdQH1rmo4PwhESwEFKOGmeUjAGetiYEdfM843VunlE
-      zSECAwEAAaOBvzCBvDAdBgNVHQ4EFgQUkY6ZHVARLmYhUbq2wz9a8uHKob4wQwYD
-      VR0RBDwwOoIXY2hpcG1vbmsuY2Rldi5iaXRtYXNrLmmCGWNoaXBtb25rLmNkZXYu
-      Yml0bWFzay5uZXSHBMd3cBMwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-      BwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx
-      7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQBpLFJ6ol3CRl8FibRlT6h8NfPg
-      w0lg3XsMUP1Jz3i1LEHaLVYh1CvFA1R6JYCxaduuTk+h0a+XtIsA6O1BqL99vOHO
-      LfXd65uJkzEMTdkqqvlf/SU8mJY6ykdAEE0eMkXBwwsGH41c2KUoT0HqE4yjnL2p
-      +3fuB2K+nOPYwZ+ynXYHQzqtwKJp1QK7snQGdkL6z9zbLTZ769xlWomAfUwD1xyi
-      Rog8mw/Z9E0coxHd+nxoWuCKrv8AYCps7Hg19M3ncnwqj5faZeEsQ1HbnW4rQ/y+
-      fwFBf0JAnyiP4joOAXmelUwbV+2dOa/8u7QcM15vfECr6QYcQg7RM9js36OJ3Fa+
-      gaxwrqcaRXDBNGVF92b2ym3illkR0P1nyh3U275oH843g3B9gLh1XAtL+ZfDRIUa
-      6qfJWmeUJKCpWv9UVtSB29uhZZGVW6Efu1+Q7/8x/m57NPB+jiSDXNJuY5gl6tSs
-      1Xmh02rs111FPjeiT3SGXXX5aRYXRxdzIFdXl7735Z4XEweY8FA/ciGUwOCwCgAf
-      jOu9fvOtOin0fNyEQC5zjVxnMxxwyj6ZfbU2mf/C2g1pBBCQSP/AagMK0WUxP8Tv
-      vlVrS8h4GhIThGF3j0VYUBPdPYn/BLW0eJ7u3Ej4d+VE+Gmmuczj++7KPuHQ5zEa
-      BnSwR4AumZaL5E0teQ==
+      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
+      97TU2LsRLjtgWEZuj+2yUhzJ4WNlPk12eYUTPA==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -440,31 +420,55 @@ x509:
       -----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