1 files changed, 81 insertions, 77 deletions
diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml
index c09560c..1bf3cc5 100644
--- a/hiera/gadwall.yaml
+++ b/hiera/gadwall.yaml
@@ -79,7 +79,7 @@ mail:
 name: gadwall
 platform: 
   major_version: "0.6"
-  version: "0.6.1"
+  version: "0.6"
 service_type: public_service
 services: 
   - couchdb
@@ -91,31 +91,6 @@ soledad:
     username: soledad
   port: 2323
   require_couchdb: true
-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: 
@@ -205,63 +180,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEtjCCAp6gAwIBAgIRAL35xH/VeDiyvMsSIHaTP6MwDQYJKoZIhvcNAQELBQAw
-      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MDQwODAwMDAwMFoXDTE1
-      MDQwODAwMDAwMFowIzEhMB8GA1UEAwwYZ2Fkd2FsbC5jZGV2LmJpdG1hc2submV0
-      MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Jt1sr/RTOJ8ue70yqv2
-      qLeo4mAVPaZsGgtkh6l5eMrTGCOHBXmZbP6ePJlWreziAZyNSyDRs8CfyIZPOVx6
-      /PNvIC7shA2d/0HI330gJ/neZR4ZGRqAq1FySjRx9eA50fUcCx5b2RQXYgBqzH/v
-      EmNbQQjvB+J9EzO6zW7yMqPIsbi/cZEieeUkRoG32+15A5aPppqbANH9bIFy/Ylp
-      prwZgeOjq3bPKLtYuah69IjpPmnYpeu/dMb65uJc3V+dhSLn4OmyF4H3mQtR68aP
-      wxAe4J6cZqXT4YQq+7o49ALSoXDwmiyilUSZtp+2QCb61yI3/MDicXAe6qjzZhqd
-      6QIDAQABo4G9MIG6MB0GA1UdDgQWBBTigfP1RqPaR2UW/LzUyR2gye7RlTBBBgNV
-      HREEOjA4ghZnYWR3YWxsLmNkZXYuYml0bWFzay5pghhnYWR3YWxsLmNkZXYuYml0
-      bWFzay5uZXSHBMd3cAUwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-      BggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66
-      LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCx4HHE4JR5AZF7mBXGcEGdaD9J+Y+I
-      rm2p22rdNycaHIMZH493UskmRgxCnw+Qzog8jirXCoK+JKuEvQOlAjpnOgVN+3pL
-      iNH9jhia4Pg+m8Jv8BNq50BWvGIvii1To1sAl+TqelAxJ0wOKQvQUUSkoAub/okx
-      rsghfjWGxvYqjQ1kVf8CF3w108FlFda1NuTeD4Vtcbkw0V0WfKQMJjqybWI/gZec
-      W3NFHcroXKPdbKVDmwp1o3I2FPSZOk3foRgehSlAVo+3qTbxbWFrm74hmq6h8K4U
-      v6ERthbBYDMcRvpYSre1Xz8WkqUULzKS3B8njNSS7wAnQBUK8ZtdnN/xd8dA47V9
-      PlQWasKQh+NLHsbtHr4gqqqizGY8HOzK1AxaqG4ERvmPx6jBMgl36gCzCdy/YJiH
-      edL/0UZ5NHmIrtVBmqStcGrJdf1r27AGMLtHQJchePoNVotOpRyTX199uVfS0Gyp
-      JRVuH8Bgl4+jJzPmPNSSJV1WUp0lca/bkKF8PgAyTzwDKyGgHRFt03ui90FEJMMd
-      8U4JefMHpBp0mOVHZtntQv+nMhEuqKiRBbt4Nq+JYUpX5E3RuWpC0Budlx0Lv1RE
-      jAR3FCr8Vvm4UoDbxvF4jeg+6Bd1D1Pz5lsMd5q/LHSk8nuTB+y2B6x96Q9/VkNc
-      14teuyf5AarZxA==
+      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
+      INlF9ecQvRtr/9CpXiQzPStGOXlgr9wvzQ==
       -----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