1 files changed, 105 insertions, 55 deletions
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index fa16470..21277e5 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -1,9 +1,4 @@
 --- 
-apt: 
-  url: 
-    backports: "http://http.debian.net/debian/"
-    basic: "http://http.debian.net/debian/"
-    security: "http://security.debian.org/"
 contacts: 
   - micah@leap.se
   - sysdev@leap.se
@@ -110,6 +105,31 @@ 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: 
@@ -219,62 +239,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      j7prdnYw9Ykg7IeZi4Q=
       -----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