diff options
Diffstat (limited to 'hiera/web1.yaml')
| -rw-r--r-- | hiera/web1.yaml | 82 |
1 files changed, 54 insertions, 28 deletions
diff --git a/hiera/web1.yaml b/hiera/web1.yaml index cd0130b..62f15c1 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -124,10 +124,10 @@ development: site_config: true dns: aliases: - - web1.bitmask.net - - bitmask.net - api.bitmask.net + - bitmask.net - nicknym.bitmask.net + - web1.bitmask.net public: true domain: full: web1.bitmask.net @@ -138,17 +138,21 @@ domain: enabled: true environment: local haproxy: - servers: - couch1: - backup: false - host: localhost - port: 4000 - weight: 10 - couch2: - backup: false - host: localhost - port: 4001 - weight: 10 + 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 hosts: couch1: domain_full: couch1.bitmask.net @@ -175,6 +179,9 @@ nickserver: username: nickserver domain: nicknym.bitmask.net port: 6425 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp @@ -216,28 +223,33 @@ ssh: ports: "60000:61000" port: 22 stunnel: - 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 + 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: {} tags: - local webapp: admins: + - azul - elijah - - varac - - micah - kwadronaut - mcnair - meanderingcode - - azul + - micah + - varac allow_anonymous_certs: false allow_limited_certs: false + allow_registration: true allow_unlimited_certs: true api_version: 1 client_certificates: @@ -253,16 +265,29 @@ webapp: password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 salt: 7e8868f8c4775290fd37d2f520d13672 username: webapp - customization_dir: /etc/leap/files/webapp/ + customization_dir: /srv/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 + revision: origin/version/0.6 source: "https://leap.se/git/leap_web" modules: - - user - billing - help + - user nagios_test_user: password: uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT username: nagios_test @@ -696,3 +721,4 @@ x509: E4LfGgOC9CfxpTJOZIJM/4jTiozg/fVedFIuAqdDpgKAUiWNBbhheQ== -----END RSA PRIVATE KEY----- use: true + use_commercial: true |