diff options
Diffstat (limited to 'hiera/web1.yaml')
| -rw-r--r-- | hiera/web1.yaml | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/hiera/web1.yaml b/hiera/web1.yaml index e8ad765..412f6dc 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -183,36 +183,11 @@ nickserver: domain: nicknym.bitmask.net port: 6425 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" 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.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: @@ -283,16 +258,12 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: "2 months" + life_span: 2m limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.7" - couchdb_admin_user: - password: _Bn6AqU54shspQxbnsQTpRySjLQKTjBh - salt: 3195fb6efdbf4b4825026116d5aaabfe - username: admin + min: "0.5" couchdb_webapp_user: password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 salt: 7e8868f8c4775290fd37d2f520d13672 @@ -313,6 +284,9 @@ webapp: - postmaster - ssladmin - www-data + git: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" modules: - billing - help |