diff options
| author | Micah Anderson <micah@riseup.net> | 2017-04-25 19:32:11 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-04-25 19:32:11 -0400 |
| commit | b69dde3981d93d3e2585de4b47ac74baa1c33830 (patch) | |
| tree | 96a47a223108e9470e1a6525dc3e1ddf02d533f4 /hiera/otter.yaml | |
| parent | d4171c00773e1ca8b05cf9c1be23d1227d9bd9af (diff) | |
switch demo to demovpn and add a demomail tag/environment
Diffstat (limited to 'hiera/otter.yaml')
| -rw-r--r-- | hiera/otter.yaml | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/hiera/otter.yaml b/hiera/otter.yaml index 6340e7c..1ad3c3c 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -13,7 +13,7 @@ domain: internal_suffix: demo.bitmask.i name: otter.demo.bitmask.net enabled: true -environment: demo +environment: demovpn firewall: ssh: from: sysadmin @@ -23,7 +23,7 @@ firewall: vpn: from: "*" port: - - 31540 + - 31244 - "443" to: "46.165.242.169" hosts: {} @@ -39,8 +39,8 @@ name: otter obfsproxy: gateway_address: "46.165.242.169" scramblesuit: - password: OVCGCNTDNMZWIYKDJZBDOWDLG4ZUGQJW - port: 31540 + password: KJEFGZTYLFEFITTDPJRXASLNKVYGEUKX + port: 31244 openvpn: adblock: false allow_limited: false @@ -64,8 +64,8 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.9" - version: "0.9" + major_version: "0.10" + version: "0.10" service_type: user_service services: - openvpn @@ -80,18 +80,19 @@ sources: revision: latest type: apt nickserver: - revision: origin/version/0.9 + revision: origin/master source: "https://leap.se/git/nickserver" type: git platform: apt: - basic: "http://deb.leap.se/0.9" + basic: "http://deb.leap.se/platform" + component: snapshots soledad: package: soledad-server revision: latest type: apt webapp: - revision: origin/version/0.8 + revision: origin/master source: "https://leap.se/git/leap_web" type: git ssh: @@ -148,21 +149,22 @@ stunnel: clients: {} servers: {} tags: - - demo + - demovpn - frankfurt tor: bandwidth_rate: 100 contacts: - elijah@leap.se - sysdev@leap.se - family: "dottereluSaR9IekHdQ,otterbagtc8Z3KPmfnT" + family: "dottereluSaR9IekHdQ,otterdVuPt9yFz8SpKm" hidden_service: active: ~ address: ~ key_type: RSA private_key: ~ public_key: ~ - nickname: otterbagtc8Z3KPmfnT + single_hop: false + nickname: otterdVuPt9yFz8SpKm x509: ca_cert: | -----BEGIN CERTIFICATE----- |