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/millipede.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/millipede.yaml')
| -rw-r--r-- | hiera/millipede.yaml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 3a5b0bf..3ca1ee0 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -13,7 +13,7 @@ domain: name: millipede.demo.bitmask.net enabled: true environment: demo -hosts: ~ +hosts: {} ip_address: "198.252.153.83" location: country_code: US @@ -24,6 +24,11 @@ mail: smarthost: - leech.demo.bitmask.net name: millipede +obfsproxy: + gateway_address: "198.252.153.84" + scramblesuit: + password: JFEV6NCYIV3FMV2CIZBVMNDCPJDUGUKE + port: 19538 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 @@ -85,6 +93,9 @@ ssh: enabled: true ports: "60000:61000" port: 4422 +stunnel: + clients: {} + servers: {} tags: - demo - seattle @@ -185,6 +196,9 @@ x509: xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF gkVBxxt/s0R2aKM= -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -226,3 +240,4 @@ x509: WVHhd08IF7vrVOiHIn3TeXsSRV+RR079ikzCTc7ueaZhHMlg/p0= -----END RSA PRIVATE KEY----- use: true + use_commercial: false |