diff options
Diffstat (limited to 'hiera')
-rw-r--r-- | hiera/deer.yaml | 2 | ||||
-rw-r--r-- | hiera/hippo.yaml | 34 | ||||
-rw-r--r-- | hiera/millipede.yaml | 2 | ||||
-rw-r--r-- | hiera/otter.yaml | 2 | ||||
-rw-r--r-- | hiera/snail.yaml | 2 | ||||
-rw-r--r-- | hiera/wallaby.yaml | 27 |
6 files changed, 16 insertions, 53 deletions
diff --git a/hiera/deer.yaml b/hiera/deer.yaml index 2a33635..bd8d208 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -78,7 +78,7 @@ tor: contacts: - micah@leap.se - sysdev@leap.se - family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT,otterbagtc8Z3KPmfnT" + family: "deeruSaR9IekHdQGUGI,otterbagtc8Z3KPmfnT" hidden_service: active: ~ address: ~ diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 7c7c7da..d853cfa 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -1,19 +1,18 @@ --- contacts: - - elijah@leap.se - sysdev@leap.se development: site_config: true dns: public: true domain: - full: hippo.demo.bitmask.net - full_suffix: demo.bitmask.net - internal: hippo.demo.bitmask.i - internal_suffix: demo.bitmask.i - name: hippo.demo.bitmask.net + full: hippo.bitmask.net + full_suffix: bitmask.net + internal: hippo.bitmask.i + internal_suffix: bitmask.i + name: hippo.bitmask.net enabled: true -environment: demo +environment: disabled hosts: {} ip_address: "85.17.92.143" location: @@ -22,14 +21,13 @@ location: name: Amsterdam timezone: "+1" mail: - smarthost: - - leech.demo.bitmask.net + smarthost: [] name: hippo obfsproxy: gateway_address: "85.17.92.167" scramblesuit: - password: GJBFKVRUNZRXKOKUKN2FAWSWLJ3XIWDC - port: 18093 + password: GZ5FI5KQJUZVSTTYOI3XESDNOVEXQR2K + port: 28975 openvpn: adblock: false allow_limited: false @@ -59,7 +57,6 @@ platform: service_type: user_service services: - openvpn - - tor ssh: authorized_keys: azul: @@ -101,20 +98,9 @@ stunnel: servers: {} tags: - amsterdam - - demo + - disabled tor: bandwidth_rate: 100 - contacts: - - elijah@leap.se - - sysdev@leap.se - family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT,otterbagtc8Z3KPmfnT" - hidden_service: - active: ~ - address: ~ - key_type: RSA - private_key: ~ - public_key: ~ - nickname: hippobagtc8Z3KPmfnT x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 17b8ec1..7adfb74 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -101,6 +101,8 @@ stunnel: tags: - demo - seattle +tor: + bandwidth_rate: 100 x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/otter.yaml b/hiera/otter.yaml index 726a860..53f937e 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -107,7 +107,7 @@ tor: contacts: - elijah@leap.se - sysdev@leap.se - family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT,otterbagtc8Z3KPmfnT" + family: "deeruSaR9IekHdQGUGI,otterbagtc8Z3KPmfnT" hidden_service: active: ~ address: ~ diff --git a/hiera/snail.yaml b/hiera/snail.yaml index b973411..19c0b5b 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -102,6 +102,8 @@ stunnel: tags: - development - istanbul +tor: + bandwidth_rate: 100 x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 4923ac5..dc582d3 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -26,27 +26,6 @@ definition_files: ], "user_ips": false }, - "host": "hippo.demo.bitmask.net", - "ip_address": "85.17.92.167", - "location": "amsterdam" - }, - { - "capabilities": { - "adblock": false, - "filter_dns": false, - "limited": false, - "ports": [ - "443" - ], - "protocols": [ - "tcp", - "udp" - ], - "transport": [ - "openvpn" - ], - "user_ips": false - }, "host": "millipede.demo.bitmask.net", "ip_address": "198.252.153.84", "location": "seattle__wa" @@ -74,12 +53,6 @@ definition_files: } ], "locations": { - "amsterdam": { - "country_code": "NL", - "hemisphere": "N", - "name": "Amsterdam", - "timezone": "+1" - }, "frankfurt": { "country_code": "DE", "hemisphere": "N", |