From da564b876b5632d87a2f4aea25661f0504c3eb6c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 18 Feb 2015 14:42:15 +0100
Subject: moved apt sources and git repo keys to generic sources key

---
 hiera/chameleon.yaml | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'hiera/chameleon.yaml')

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 68e2935..901dff9 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -2,11 +2,6 @@
 api: 
   domain: api.unstable.bitmask.net
   port: 4430
-apt: 
-  url: 
-    backports: "http://http.debian.net/debian/"
-    basic: "http://http.debian.net/debian/"
-    security: "http://security.debian.org/"
 contacts: 
   - sysdev@leap.se
   - varac@leap.se
@@ -630,6 +625,31 @@ service_type: public_service
 services: 
   - monitor
   - webapp
+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: 
@@ -712,7 +732,7 @@ webapp:
   client_certificates: 
     bit_size: 2048
     digest: SHA256
-    life_span: 2m
+    life_span: "2 months"
     limited_prefix: LIMITED
     unlimited_prefix: UNLIMITED
   client_version: 
@@ -738,9 +758,6 @@ webapp:
     - postmaster
     - ssladmin
     - www-data
-  git: 
-    revision: origin/version/0.6
-    source: "https://leap.se/git/leap_web"
   modules: 
     - billing
     - help
-- 
cgit v1.2.3