diff options
author | varac <varacanero@zeromail.org> | 2015-02-18 14:42:15 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-02-18 14:42:15 +0100 |
commit | da564b876b5632d87a2f4aea25661f0504c3eb6c (patch) | |
tree | e12e0ccd319b1661189d7fc512ac99c3310c31a1 /hiera/wallaby.yaml | |
parent | 100efe8a10e3f7a667bcbc86cb617f4e56b2fe33 (diff) |
moved apt sources and git repo keys to generic sources key
Diffstat (limited to 'hiera/wallaby.yaml')
-rw-r--r-- | hiera/wallaby.yaml | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 498106d..6e21263 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -2,11 +2,6 @@ api: domain: api.demo.bitmask.net port: 4430 -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -238,6 +233,31 @@ platform: service_type: public_service services: - 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: @@ -308,7 +328,7 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: @@ -334,9 +354,6 @@ webapp: - postmaster - ssladmin - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help |