1 files changed, 105 insertions, 56 deletions
diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml
index cf845c7..ef6f500 100644
--- a/hiera/urchin.yaml
+++ b/hiera/urchin.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
@@ -111,6 +106,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: 
@@ -220,63 +240,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIErzCCApegAwIBAgIQBtxZ63ANP2zxx6O7/c8ASDANBgkqhkiG9w0BAQsFADBK
-      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw
-      NDA4MDAwMDAwWjAhMR8wHQYDVQQDDBZ1cmNoaW4uZGV2LmJpdG1hc2submV0MIIB
-      IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqDWdRzzKP/nrzFrPMDtK3EVe
-      GDfIS6vnzK0wbuNQfLL8Z7l/QZ3EsMN2mMqj9J5hb2rAto/ORWr9kQCRzcOm4tTu
-      oh8XzLaY8GvrV7WG4IfUIkZDFFrDxilSpNreoz25GucuMwi0sWueXqUy0/s3mnpa
-      v2MwOPubUmfNPvfKKUmJNvlnwhglTWGXeFJZtBh10q50KLhAjjLixyJ2GlRwl28F
-      yXTVg6u5Khrb+6jquSCYws6uqTYT3bn96+pmgfkiSZ/4wPBVFhbdticgrgPzEh2N
-      NRWwtuwrzXzkBwjp/m8U3J1Ht7wA+W5rh4e1y2ey1VQLNn4EUDGiAQfToW/rtwID
-      AQABo4G5MIG2MB0GA1UdDgQWBBRab/LLDtInNAQuqdXWHLxH3WKsyDA9BgNVHREE
-      NjA0ghR1cmNoaW4uZGV2LmJpdG1hc2suaYIWdXJjaGluLmRldi5iaXRtYXNrLm5l
-      dIcEsDVFFTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-      BwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
-      DQYJKoZIhvcNAQELBQADggIBAHRbXhAeqHMuzCT4wMpFYxcaDlPvm8unBDMPrpwl
-      vvTZmuTBWf6rQpXKUrzxiXUJMib3czk7iM8d9bqU/6D+MFKNJ/XM52ARENFCESwC
-      nhUPNKywOm7D6gE38qfb7IyJyatWlNflnicS7JuwQuJoyQFWJ8L5vY/8W80/49ia
-      4VDFWHQf8fohtX6lxTniXtE4HQ77ziQ9ToxlBEVPeiGU8nImWP8i7ZSptAVVXjpY
-      ZMUCfSN3O5klCqZPJ25anewQzKC1q1rBhm6q5WFETFRR46qrGhNdQUlbePb/pTBA
-      UNU5RUMEc034Xi/Q/SMLWbzNMrwu0/thVxtMFLZX5Mk26Toaj+7/YrBeQzQFRXqp
-      Hr058iDhAVA71ZjfWJqA9hxSQ0CtNZ19J5Xy210Buqz6Z9u8UQbRRa6Py0TJps46
-      OIWYyagsDSQF/ieh2m1bEq76GyVlmPyj/YC8jjIytjSplzV3j6x7kk/H6XobVXbZ
-      UBo5OgzLetxwukbvq5SvBm82kf94619Zrejl5jY+B2z2oDB+9k+qhL1tUerDJloO
-      lCPLJ/gSrm+SN0x4AVMGShpmxr+VufIOWr8WW6R/nYkpNfSgox/iQnBwuSWE7boM
-      ybiYSdH+/McFmTTS/zAD9bA3erdGPrbpNhJTNorQ2MYFWF6I8jq/g8pCtwQfDDGl
-      CFSx
+      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
+      rbX+vWsGmizCAC6WQXG1QkLa+pM=
       -----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