diff options
| author | Micah Anderson <micah@riseup.net> | 2015-05-06 12:31:19 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-05-06 12:31:19 -0400 |
| commit | e5cac49bf5da68efdc7ab0ec73f41a19b3a73e5c (patch) | |
| tree | 7b78abfc1caef8ed728eeb9eda368ff2ed1c4ba6 /hiera/wallaby.yaml | |
| parent | 53e0f51b69d867c26e128a2e6c21ad99e6cbc9c6 (diff) | |
update elk to use port 4422 for ssh, like the others; re-deploy the dev machines, so their ssh keys changed
Diffstat (limited to 'hiera/wallaby.yaml')
| -rw-r--r-- | hiera/wallaby.yaml | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 2296cb2..7d6d845 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -228,36 +228,11 @@ nickserver: domain: nicknym.demo.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 ssh: authorized_keys: azul: @@ -328,16 +303,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: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW - salt: e1dca99375c513be477295f141b9f032 - username: admin + min: "0.5" couchdb_webapp_user: password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg salt: c632af58769857bcdf108b46da9eaa44 @@ -358,6 +329,9 @@ webapp: - postmaster - ssladmin - www-data + git: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" modules: - billing - help |