moved apt sources and git repo keys to generic sources key

1 files changed, 105 insertions, 56 deletions

diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 70b35c4..20649f9 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.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: 
   - backup
+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: 
@@ -114,63 +134,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEsjCCApqgAwIBAgIQXxRcwbUoQ5DTbkpRSrnA0zANBgkqhkiG9w0BAQsFADBK
-      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw
-      NDA4MDAwMDAwWjAiMSAwHgYDVQQDDBdsYWR5YnVnLmRldi5iaXRtYXNrLm5ldDCC
-      ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALg0wT0v1r5D7vzF2Taxr98l
-      GDH3ADuz9UDUmqA1+b8KdI2GliCmYCuxzHMVNkZvvi9HMlS/joC6P1JNA8ivY1Uu
-      BWaf1CTUjdA2XHxO3P9/ThTxehCIrTMyc/be8yrh4ND17Bn6oCmctLV3bwB8peQu
-      Pdj1KEwtEyrMdK74Ob01xrCDWxRolzrdjwJhmi1JoikY4u9pl8TDWg9ax6MA892R
-      4pDgVXLoOQvs0YSURuO6r7/isrMKzeuGZYVRmTuIUIw22wwQlE1sraHwA4BPILw5
-      2Qyy8WNa5wyeCvmkDUKF/B0q+cpxdtS4cZ5TIhKb42m8XMCzTZ1SCV0rCWNBP70C
-      AwEAAaOBuzCBuDAdBgNVHQ4EFgQUio05i8R96aSOJyIOSM8z0us+L7IwPwYDVR0R
-      BDgwNoIVbGFkeWJ1Zy5kZXYuYml0bWFzay5pghdsYWR5YnVnLmRldi5iaXRtYXNr
-      Lm5ldIcEx3dwCDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-      AQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+
-      D48wDQYJKoZIhvcNAQELBQADggIBADeojAFQiMqFgFIA1a1jKgAMEtYOmNfqjfDV
-      L2dfCaSYOAcBFltwu87pO8pXbCQgborhGvB3hS7/4tmI6ibTZEscxOQnREWKyyua
-      MFHn8JW6oW10xh/6dG/Eo0PC31WTaXA3+MR0/EgiQWxRt5inZ4x7V+d/pOj01qpO
-      3tpsnQFlu0kcOaj8wUYhSioyVLUxk2hZWLCNTrzmGK3o6+9E6/5+sgZ99c8XKMlm
-      7n0+2CC9BPZoKKSY64PuuchTlKdbf5EzFV8LozOaMu9x583bTaXiu8CvSMYknPV6
-      A/uvuPrgZh8B9IYoQE25grJOonfWaj97AvDhizKCO0vCwnef6DyravCkrX/5L+Fc
-      6WlZ3z0HXH9d0BjvBwD8aYjxUiyoRfQCDeNfJgQ4ZDjKJ4+8dwjxA8QlLwFL6xrV
-      s/PHB7Za+emzBtuh55MDIgfkbofW0mUKCQqOHB0dAMyL9uYshlIgaazuntwmjQ2q
-      SDEUrv0Nccj8vaAgmkhmmgOXeKJfsEtc5huBmIUGDrhpIdO9E0eXOp4xZkaZbPi7
-      L/IBfnhqjRPumli/y1Fdo8VLLzfOm9ot5deLD+LnOM59T9P2f3wY5akzcDvt35M5
-      2N0VqoLqitPE/iBC/2Huwtf8fjEy61PFpGTne4vYmuwyzn5B57vOtxZFxnXObvXc
-      vq8Eyi/G
+      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
+      CqJz60H5WKW3ETRjsmgetMitfBNho5s=
       -----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