diff options
author | elijah <elijah@riseup.net> | 2014-11-24 14:26:56 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-11-24 14:26:56 -0800 |
commit | f2b9da8ea0f8a138af63f05fe1e43c90b237ebd7 (patch) | |
tree | b3bf400f8c2a725027555de0fbe6beab14251664 /hiera/millipede.yaml | |
parent | 374a68a2d63b66d23a69b7922dea27b4d2a008c3 (diff) | |
parent | 364a43d1ac65abd030baeddfc3eff763486cfe16 (diff) |
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'hiera/millipede.yaml')
-rw-r--r-- | hiera/millipede.yaml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 3ca1ee0..6fdbf6b 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -24,11 +24,6 @@ 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 @@ -51,9 +46,6 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false -platform: - major_version: "0.6" - version: "0.6" service_type: user_service services: - openvpn @@ -93,9 +85,6 @@ ssh: enabled: true ports: "60000:61000" port: 4422 -stunnel: - clients: {} - servers: {} tags: - demo - seattle @@ -196,9 +185,6 @@ x509: xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF gkVBxxt/s0R2aKM= -----END CERTIFICATE----- - commercial_ca_cert: ~ - commercial_cert: ~ - commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -240,4 +226,3 @@ x509: WVHhd08IF7vrVOiHIn3TeXsSRV+RR079ikzCTc7ueaZhHMlg/p0= -----END RSA PRIVATE KEY----- use: true - use_commercial: false |