moved apt sources and git repo keys to generic sources key

1 files changed, 104 insertions, 54 deletions

diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 9540bfb..b59cb6d 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.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
@@ -65,6 +60,31 @@ platform:
 service_type: user_service
 services: 
   - openvpn
+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: 
@@ -145,31 +165,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      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
+      H12x0G0Zudi0jG44mezZQA==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -222,31 +248,55 @@ x509:
       -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      MIIJKAIBAAKCAgEAsOfRDa5n4eBd7a7+CQ2ZWLdPo25Es0JG7LGJV8Ruq2Srkn2G
+      PaCD+dvW6bJvr1V0YZB5PB2oUOuTMw0EL866FeXKmm9uEYItS0CO7EpVm1JqFHLi
+      b0/msyQu0+rY9aXmx2wojenF6YQcHwjzqGSImURlpYxCepePVP5zLsQ1t3NlRyp0
+      NyQuqxAuEbaAxFocI8NCklB638z7O9aNI6Az7iGEeR2S4ZnZc4FZJ2/YL68up1jt
+      UmCkR/8H8KdrFxTy3QWWSnwh2H/qLlyHM+vNgi/WiazW+UA06AagC5WLutj/V0SC
+      BMz7IQYuR82Zhb4KKkigyCyDdTbWdyEMCf4pXCICy9K/TSkfnTuKsr3Lt0SKKZnz
+      V/pc/3JLzrlVdsm03vcLB/8n36G3RvD85NusD/oQsmZcy3zE6hfrAABaYAScKKNb
+      HSo/SR9ZdMD/jnvxF87BdSLPk7smshLX0C44Hc0K+qgbBHGw6bgIm+HHuJk8bNfg
+      UQBu9eDZgAoiLPyR6OIQSAgLxYgRpUboLK/BovNBWkaEoQrtlNhXlQqhjM/a5mnm
+      zreKkRC/z8PMk1sJJt18FzYe1Sxy/RLYxZet7tuTnuFfUGYHOa/MYtO48gbphQAW
+      4jUrzeNytk377RzPpAUc78fXbdDQY74uBAxTthZdSj5tdDztacq9ek2L4DcCAwEA
+      AQKCAgATuKQbjFfUXHjcKGf1hmiT9UuRgpdyDG9vr5MKD8HupXhjCk9Oy3grAJEC
+      2HuO5k3lGoAJbZz3+Gseg9L1qWwhSM6/TLDOjt6Rxw6n1NmaSSO+R9hqZFPpoJz/
+      zuyE5gvGK46R03/Wun2QECVpnluECpXyUKKQnBjEduFMU19RpjGiL19pTkVNmK4q
+      F1hfi1QbwIbJXON105omX5K4aAGiCGaGQf+/2rDdKYxQ0y0ck8D1svox9sgZppqx
+      /1f26MTyUs8gWppDUm8+393KsfzlCIQ4MOZ+PuQnAaYR5IgBOnOsvNxpwJg2ZEQA
+      iTEWMctcT2BtMFkvVf+upCZ9brIZfaPlQjIcRm2439Eetx0KC+v3xpMdnPZVxhjU
+      W0yQr0xJWgc6iW7jJT6COUqLPADuJ9VyFca4iZjWHLtTV9Ufnytn9kxLviropG/X
+      CYsSX85+9kVTz4vNbviltvwWQhOHv8nyo6/WaSFv/qm7mSds+SBVpWi7obgjKiyy
+      TfL/zqnVH8PQsjqm59i/W52hRNaStAFtAXieYG/2fnEhHUwIwqvxPB/wGSs0YRIl
+      o+aphOCGDmCPSkclE6H5uoRMi3DuTMgpSlGy6s0lu516sOJSkvfYcCCb/WvC6XOR
+      +a6bCfjgsgzTdaxYyiWFqBrSZZqFS5XiaSjVZuxflwoy6HAHMQKCAQEA6R5bsFjz
+      HBSgBdw+unh6ZKxK7k0wEq/AnsDUvui/Zgr8muUqueFj/Y7iuBjYH6xZH06o9IzF
+      EfNkq/bRFTV5Dn7/VqTCqp0ugs3Ye6jCmC4s0sZe9PN0iqu348UUz57c7y72pS1s
+      Br0YoHHtQqSjZPNPaqobS6RedVj1f/fLPXEpSecSxG62KbrxDuOzAIhcTdIhnsLV
+      PIO+RsmYsIq/wUQqN1jbqm9ereQC2KrEGYsY9+qRc7x0ENdmAQP8eHOS1lCUTgZt
+      KAfym392S8sFTp5iqwZoB67bAgxz7P6V7LpqjjBqxORyf3ylmKEgOv4/udkSqgUm
+      v364fYw73262HQKCAQEAwkT51lDSJevUBOgKL1f2aTjF+8njyPvZRCOp33tdD9CL
+      lzRZ2TurpBmNpWq5UhposHGon0QQxyKLCw3CdxOKqBRcm67Ik7khtmNDXJoBZknv
+      F5T6ZagWrsK266nrcDIsN5JY4++xwKoxqHPF/0AFasL0uC70hDwE330FOeEEaaTJ
+      Ebc+KaMMDqurBpOvxPQxmiWsL02//vdvm5bUz+we4o3oji1fSPp8T22cWg6gzzEB
+      HFlUmrRBMck78v7Ly0qOjs/CGL5jrh83ExEQv9E2DDvgqzmuCQ42LyuxaSslsQgq
+      k0CzvKqSz+Ere80imAv81wtCnZ1DVkQQ+v8jkULPYwKCAQEAkiffcowCOAvSXHo+
+      teiNTAsdm5S3XC/mw2HAwMTqI08mGvMtO4dNio6IJMYm0oza/57wnQqZD+0apBpF
+      8lcpQ+Zprmf0SMXtgEMQxE8FWiYxIiEPLeJpofuRenN43ccLW8aFCwCUZxEtnIJx
+      L8RLUSKfGw/1txIhys7wdL/mI+qL6XK/uHp1KWq0chJeiynzPTNOstwSlzM+G+GP
+      IriLCt/y2+qRJqVWpg17n15JPn6QM/dUJEz2NAzoPiDCrL5BRK8WnGi5DU0WVVmv
+      0EtEU4tH71Q/6vk9BGbMU702QEqMPgOrHTDhfH6o0C3NKE95osqvQfui1JLdlpFS
+      hH5EHQKCAQAMIHgkC7mCin0arU1tdSU5nkSlmg2xDx+Z5EwHWlEN2qvMDYWKTPJC
+      9SFlcQsOd/2O/hlTj9EoTRy23O4Ftt+R7Gt3gGqe5hCXrQyYbDioJPda1n7m954q
+      3JbEkT/UKh2efnE0EVNcPoOJC2kRrPJpnq/eC3hSBNkdBlXcLhKzcYjnpTOpL7dh
+      9w9fArsXJVMvVyivb0AL73A1Gy4/qHKpG8inj2eCS7iU0LfQ21boeBukpGLmoVfs
+      fq5SVdts3kOV4JwyJThdty8d7pPIFYw1KUu2BIy7nfp96VFSylG5AlR+Cqztmww9
+      E8Y+HSkKqrzmw5ot8pIwgWE5+dFDkRMXAoIBAC4KZThPbZoA7L2b83Ext4c6hiFl
+      CHt6ahyuR883b0BOeEyl23vm63MAC3BSj3GEoY3x//cltVs0xeemO8O3bCpY8XL2
+      vtoRfyO9SynwoSl7HJFw7EdxbKLrHJURJ893MLp0q2SvXbJ4twcS785VPgWJN0LE
+      VRArZVe1IfK2765BFK+SRGOKsPytwkrPE7APb4cRpKYOJMEuvSshDKoCVkRRdlS5
+      dFsMNwZQXKhDwq2EKB5fU/KdJKOogQN0Y6R7EOOGtNO4lRghTHH67ZSY0nz+Kh+u
+      QPDb80eGwzicnL70DfORjyNr/IY82/xyzVRpgqZ8Z2/Kab8IPdqtpgBnDX4=
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false