summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-01-19 10:39:52 -0800
committerelijah <elijah@riseup.net>2016-01-19 10:39:52 -0800
commit43c47fd5d271e98a68fa9e7035fe120b8c848d25 (patch)
treed7b855db2d9b8d306dc5cd2268c1b6d1b656d8fb /hiera
parent92cb903fda58c46a645e95a9e2e51136d5fa10ea (diff)
re-enable otter.
Diffstat (limited to 'hiera')
-rw-r--r--hiera/leech.yaml1
-rw-r--r--hiera/wallaby.yaml27
2 files changed, 28 insertions, 0 deletions
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index ac6e482..fe1f592 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -88,6 +88,7 @@ mynetworks:
- "204.13.164.171"
- "204.13.164.57"
- "37.218.240.101"
+ - "46.165.242.166"
- "85.17.92.143"
name: leech
platform:
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 72d0062..43b47fe 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -29,9 +29,36 @@ definition_files:
"host": "millipede.demo.bitmask.net",
"ip_address": "198.252.153.84",
"location": "seattle__wa"
+ },
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "ports": [
+ "443"
+ ],
+ "protocols": [
+ "tcp",
+ "udp"
+ ],
+ "transport": [
+ "openvpn"
+ ],
+ "user_ips": false
+ },
+ "host": "otter.demo.bitmask.net",
+ "ip_address": "46.165.242.169",
+ "location": "frankfurt"
}
],
"locations": {
+ "frankfurt": {
+ "country_code": "DE",
+ "hemisphere": "N",
+ "name": "Frankfurt",
+ "timezone": "+1"
+ },
"seattle__wa": {
"country_code": "US",
"hemisphere": "N",