1 files changed, 105 insertions, 55 deletions
diff --git a/hiera/elk.yaml b/hiera/elk.yaml
index 778183a..d249406 100644
--- a/hiera/elk.yaml
+++ b/hiera/elk.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
@@ -102,6 +97,31 @@ platform:
 service_type: internal_service
 services: 
   - couchdb
+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: 
@@ -211,62 +231,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      PO+cnwXHBGM+bZk=
       -----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