1 files changed, 105 insertions, 55 deletions
diff --git a/hiera/deer.yaml b/hiera/deer.yaml
index aeb83f5..1645d86 100644
--- a/hiera/deer.yaml
+++ b/hiera/deer.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
@@ -36,6 +31,31 @@ platform:
 service_type: internal_service
 services: 
   - tor
+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: 
@@ -128,62 +148,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      f2L6JFTn3YW6AryUOg==
       -----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