diff options
| author | Micah Anderson <micah@riseup.net> | 2014-10-30 16:42:35 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-10-30 16:52:18 -0400 |
| commit | 910613898c53a42da9e8777b5d1e19ee8de81634 (patch) | |
| tree | 4100a70989152f6a4f3287947c1f53f6a33f215f /hiera/hippo.yaml | |
| parent | 49b0ae0d37fddc0dc9d32371160376329af1a1b7 (diff) | |
update host keys for reset dev servers; add new secrets for couch replication and scramblesuit, and other hiera options that were updated
Diffstat (limited to 'hiera/hippo.yaml')
| -rw-r--r-- | hiera/hippo.yaml | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 5803686..77df114 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -13,7 +13,7 @@ domain: name: hippo.demo.bitmask.net enabled: true environment: demo -hosts: ~ +hosts: {} ip_address: "85.17.92.143" location: country_code: NL @@ -24,6 +24,11 @@ mail: smarthost: - leech.demo.bitmask.net name: hippo +obfsproxy: + gateway_address: "85.17.92.167" + scramblesuit: + password: ONLW2MTQJJ4HUU3WGNVEC42JIF4XEWDS + port: 18943 openvpn: adblock: false allow_limited: false @@ -46,6 +51,9 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn @@ -86,14 +94,17 @@ ssh: enabled: true ports: "60000:61000" port: 4422 +stunnel: + clients: {} + servers: {} tags: - - demo - amsterdam + - demo tor: bandwidth_rate: 100 contacts: - sysdev@leap.se - family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG" + family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT" nickname: hippobagtc8Z3KPmfnT x509: ca_cert: | @@ -192,6 +203,9 @@ x509: xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF gkVBxxt/s0R2aKM= -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -233,3 +247,4 @@ x509: Dqxr7d6Ded5Witr98xqbbXZLkwf/iUHAwT9xTnFD+2mfRIwN3ifYSA== -----END RSA PRIVATE KEY----- use: true + use_commercial: false |