diff options
| author | Micah Anderson <micah@riseup.net> | 2014-11-24 16:11:17 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-11-24 16:11:17 -0500 |
| commit | 364a43d1ac65abd030baeddfc3eff763486cfe16 (patch) | |
| tree | 490cc48ed0f7bf2022c35792d29067e4d7bd03c1 /hiera/web1.yaml | |
| parent | 2d0248f9c8d9692ec7df4f46c659282d1a7c310c (diff) | |
update ssh host keys
Diffstat (limited to 'hiera/web1.yaml')
| -rw-r--r-- | hiera/web1.yaml | 80 |
1 files changed, 27 insertions, 53 deletions
diff --git a/hiera/web1.yaml b/hiera/web1.yaml index 8fed05a..cd0130b 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -124,10 +124,10 @@ development: site_config: true dns: aliases: - - api.bitmask.net + - web1.bitmask.net - bitmask.net + - api.bitmask.net - nicknym.bitmask.net - - web1.bitmask.net public: true domain: full: web1.bitmask.net @@ -138,21 +138,17 @@ domain: enabled: true environment: local haproxy: - couch: - listen_port: 4096 - servers: - couch1: - backup: false - host: localhost - port: 4000 - weight: 10 - writable: true - couch2: - backup: false - host: localhost - port: 4001 - weight: 10 - writable: true + servers: + couch1: + backup: false + host: localhost + port: 4000 + weight: 10 + couch2: + backup: false + host: localhost + port: 4001 + weight: 10 hosts: couch1: domain_full: couch1.bitmask.net @@ -179,9 +175,6 @@ nickserver: username: nickserver domain: nicknym.bitmask.net port: 6425 -platform: - major_version: "0.6" - version: "0.6" service_type: public_service services: - webapp @@ -223,33 +216,28 @@ ssh: ports: "60000:61000" port: 22 stunnel: - clients: - couch_client: - couch1_5984: - accept_port: 4000 - connect: couch1.bitmask.i - connect_port: 15984 - original_port: 5984 - couch2_5984: - accept_port: 4001 - connect: couch2.bitmask.i - connect_port: 15984 - original_port: 5984 - servers: {} + couch_client: + couch1_5984: + accept_port: 4000 + connect: couch1.bitmask.i + connect_port: 15984 + couch2_5984: + accept_port: 4001 + connect: couch2.bitmask.i + connect_port: 15984 tags: - local webapp: admins: - - azul - elijah + - varac + - micah - kwadronaut - mcnair - meanderingcode - - micah - - varac + - azul allow_anonymous_certs: false allow_limited_certs: false - allow_registration: true allow_unlimited_certs: true api_version: 1 client_certificates: @@ -265,29 +253,16 @@ webapp: password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 salt: 7e8868f8c4775290fd37d2f520d13672 username: webapp - customization_dir: /srv/leap/files/webapp/ + customization_dir: /etc/leap/files/webapp/ default_service_level: 1 domain: bitmask.net - engines: - - support - forbidden_usernames: - - admin - - administrator - - arin-admin - - certmaster - - contact - - info - - maildrop - - postmaster - - ssladmin - - www-data git: revision: origin/master source: "https://leap.se/git/leap_web" modules: + - user - billing - help - - user nagios_test_user: password: uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT username: nagios_test @@ -721,4 +696,3 @@ x509: E4LfGgOC9CfxpTJOZIJM/4jTiozg/fVedFIuAqdDpgKAUiWNBbhheQ== -----END RSA PRIVATE KEY----- use: true - use_commercial: true |