diff options
Diffstat (limited to 'nodes')
38 files changed, 244 insertions, 63 deletions
diff --git a/nodes/aligator.json b/nodes/aligator.json index cafe4c9..b5a2e5e 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -1,12 +1,7 @@ { - "services": [ "openvpn", "tor" ], - "tor": { - "type": "exit", - "nickname": "alligator" - }, + "services": "openvpn", "ip_address": "176.53.69.121", - "interface": "eth0", - "tags": "production", + "tags": ["production", "istanbul"], "openvpn": { "gateway_address": "176.53.69.123", "allow_free": false, diff --git a/nodes/ant.json b/nodes/ant.json new file mode 100644 index 0000000..b5d3373 --- /dev/null +++ b/nodes/ant.json @@ -0,0 +1,9 @@ +{ + "ip_address": "198.252.153.82", + "services": "couchdb", + "tags": [ + "production", + "seattle" + ], + "enabled": true +} diff --git a/nodes/beetle.json b/nodes/beetle.json new file mode 100644 index 0000000..5be0ae0 --- /dev/null +++ b/nodes/beetle.json @@ -0,0 +1,9 @@ +{ + "ip_address": "202.85.227.195", + "tags": ["production", "hongkong"], + "services": "openvpn", + "openvpn": { + "gateway_address": "202.85.227.196" + // secondary_address 202.85.227.197 + } +} diff --git a/nodes/ca1.json b/nodes/ca1.json deleted file mode 100644 index a4ea563..0000000 --- a/nodes/ca1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "services": "ca", - "ip_address": "10.5.5.48", - "interface": "eth0" -} diff --git a/nodes/canvasback.json b/nodes/canvasback.json new file mode 100644 index 0000000..b3a8deb --- /dev/null +++ b/nodes/canvasback.json @@ -0,0 +1,8 @@ +{ + "services": "webapp", + "tags": ["clientdev", "dc"], + "ip_address": "199.119.112.4", + "ssh": { + "port": 22 + } +} diff --git a/nodes/chipmonk.json b/nodes/chipmonk.json new file mode 100644 index 0000000..fc71590 --- /dev/null +++ b/nodes/chipmonk.json @@ -0,0 +1,9 @@ +{ + "services": ["mx"], + "tags": ["clientdev", "dc"], + "ip_address": "199.119.112.19", + "ssh": { + "port": 22 + } +} + diff --git a/nodes/clam.json b/nodes/clam.json new file mode 100644 index 0000000..b9e5f66 --- /dev/null +++ b/nodes/clam.json @@ -0,0 +1,11 @@ +{ + "ip_address": "176.53.69.22", + "services": [ + "couchdb", + "soledad" + ], + "ssh": { + "port": 4422 + }, + "tags": ["development", "istanbul"] +} diff --git a/nodes/couch1.json b/nodes/couch1.json index 4b1dde1..e340357 100644 --- a/nodes/couch1.json +++ b/nodes/couch1.json @@ -1,4 +1,7 @@ { - "services": "couchdb", + "services": [ + "couchdb", + "soledad" + ], "ip_address": "10.5.5.44" } diff --git a/nodes/couch2.json b/nodes/couch2.json new file mode 100644 index 0000000..83c564d --- /dev/null +++ b/nodes/couch2.json @@ -0,0 +1,7 @@ +{ + "services": [ + "couchdb", + "soledad" + ], + "ip_address": "10.5.5.52" +} diff --git a/nodes/demodex.json b/nodes/demodex.json new file mode 100644 index 0000000..79b96b1 --- /dev/null +++ b/nodes/demodex.json @@ -0,0 +1,8 @@ +{ + "ip_address": "204.13.164.171", + "services": ["backup"], + "tags": ["production", "development", "seattle"], + "ssh": { + "port": 22 + } +} diff --git a/nodes/dolphin.json b/nodes/dolphin.json new file mode 100644 index 0000000..802d3f0 --- /dev/null +++ b/nodes/dolphin.json @@ -0,0 +1,11 @@ +// +// also has IP: 223.223.175.11 +// +{ + "ip_address": "223.223.175.10", + "tags": ["production", "phnompenh"], + "services": "openvpn", + "openvpn": { + "gateway_address": "223.223.175.15" + } +} diff --git a/nodes/elephant.json b/nodes/elephant.json index 46cc3e6..d9626e2 100644 --- a/nodes/elephant.json +++ b/nodes/elephant.json @@ -1,6 +1,6 @@ { - "services": [ "webapp", "monitor" ], - "tags": "development", + "services": ["webapp", "monitor"], + "tags": ["development", "istanbul"], "ip_address": "176.53.69.13", "ssh": { "port": 4422 diff --git a/nodes/elk.json b/nodes/elk.json new file mode 100644 index 0000000..a287b6f --- /dev/null +++ b/nodes/elk.json @@ -0,0 +1,8 @@ +{ + "ip_address": "204.13.164.252", + "services": "couchdb", + "tags": [ + "development", "seattle" + ], + "enabled": true +} diff --git a/nodes/gadwall.json b/nodes/gadwall.json new file mode 100644 index 0000000..8d0f988 --- /dev/null +++ b/nodes/gadwall.json @@ -0,0 +1,13 @@ +{ + "services": ["couchdb", "soledad"], + "tags": ["clientdev", "dc"], + "ip_address": "199.119.112.5", + "ssh": { + "port": 22 + } + //"openvpn": { + // "gateway_address": "199.119.112.6", + // "second_gateway_address": "199.119.112.7" + //} +} + diff --git a/nodes/hippo.json b/nodes/hippo.json new file mode 100644 index 0000000..79f295c --- /dev/null +++ b/nodes/hippo.json @@ -0,0 +1,15 @@ +// http://torstatus.blutmagie.de/router_detail.php?FP=855b6cfe6c20a48cf1b815b87d565df6ea93e74a +{ + "ip_address": "85.17.92.143", + "services": ["openvpn","tor"], + "tags": ["production", "amsterdam"], + "openvpn": { + "gateway_address": "85.17.92.167" + }, + "tor": { + // KB/s + "bandwidth_rate": 100, + "type": "exit", + "nickname": "hippo" + } +} diff --git a/nodes/koala.json b/nodes/koala.json deleted file mode 100644 index 7484a99..0000000 --- a/nodes/koala.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "services": "ca", - "ip_address": "176.53.69.125", - "interface": "eth0", - "tags": "production" -} diff --git a/nodes/leech.json b/nodes/leech.json new file mode 100644 index 0000000..316257c --- /dev/null +++ b/nodes/leech.json @@ -0,0 +1,8 @@ +{ + "ip_address": "198.252.153.85", + "services": "mx", + "tags": [ + "production", + "seattle" + ] +} diff --git a/nodes/millipede.json b/nodes/millipede.json new file mode 100644 index 0000000..d96be1a --- /dev/null +++ b/nodes/millipede.json @@ -0,0 +1,11 @@ +{ + "ip_address": "198.252.153.83", + "openvpn": { + "gateway_address": "198.252.153.84" + }, + "services": ["openvpn", "tor"], + "tags": [ + "production", + "seattle" + ] +} diff --git a/nodes/mole.json b/nodes/mole.json deleted file mode 100644 index 2259114..0000000 --- a/nodes/mole.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "services": "couchdb", - "ip_address": "176.53.69.17", - "ssh": { - "port": 4422 - }, - "tags": "development" -} diff --git a/nodes/mx1.json b/nodes/mx1.json new file mode 100644 index 0000000..ffd6149 --- /dev/null +++ b/nodes/mx1.json @@ -0,0 +1,4 @@ +{ + "services": "mx", + "ip_address": "10.5.5.51" +} diff --git a/nodes/plain1.json b/nodes/plain1.json new file mode 100644 index 0000000..b0e3e69 --- /dev/null +++ b/nodes/plain1.json @@ -0,0 +1,3 @@ +{ + "ip_address": "10.5.5.53" +} diff --git a/nodes/python.json b/nodes/python.json deleted file mode 100644 index 783123a..0000000 --- a/nodes/python.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "services": "couchdb", - "ip_address": "176.53.69.16", - "ssh": { - "port": 4422 - }, - "tags": "development" -} diff --git a/nodes/rhino.json b/nodes/rhino.json new file mode 100644 index 0000000..3fddd25 --- /dev/null +++ b/nodes/rhino.json @@ -0,0 +1,15 @@ +{ + "ip_address": "202.85.227.204", + "services": "tor", + "tags": [ + "development", + "hongkong" + ], + "tor": { + // KB/s + "bandwidth_rate": 100, + "type": "relay", + "nickname": "rhino" + } + +} diff --git a/nodes/sloth.json b/nodes/sloth.json index 7ce5483..fc9cb88 100644 --- a/nodes/sloth.json +++ b/nodes/sloth.json @@ -1,8 +1,8 @@ { - "services": "couchdb", + "services": ["couchdb", "soledad"], "ip_address": "176.53.69.122", "ssh": { "port": 4422 }, - "tags": "production" + "tags": ["production", "istanbul"] } diff --git a/nodes/slug.json b/nodes/slug.json index c6cb225..ad22bfd 100644 --- a/nodes/slug.json +++ b/nodes/slug.json @@ -4,5 +4,5 @@ "ssh": { "port": 4422 }, - "tags": "production" + "tags": ["production", "istanbul"] } diff --git a/nodes/snail.json b/nodes/snail.json index a973ad1..98ea6d1 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -1,15 +1,13 @@ { - "services": [ "openvpn", "tor" ], - "tor": { - "type": "exit", - "nickname": "snail" - }, + "services": "openvpn", "ip_address": "176.53.69.14", - "interface": "eth0", - "tags": "development", + "tags": ["development", "istanbul"], "openvpn": { "gateway_address": "176.53.69.19", "allow_free": false, "filter_dns": true + }, + "ssh": { + "port": 4422 } } diff --git a/nodes/snake.json b/nodes/snake.json new file mode 100644 index 0000000..f8e715d --- /dev/null +++ b/nodes/snake.json @@ -0,0 +1,10 @@ +{ + "ip_address": "199.119.112.22", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "dc"], + // currently down in DC, 2013-06-27 + "enabled": false +} diff --git a/nodes/starfish.json b/nodes/starfish.json new file mode 100644 index 0000000..721a996 --- /dev/null +++ b/nodes/starfish.json @@ -0,0 +1,8 @@ +{ + "ip_address": "176.53.69.23", + "services": "mx", + "ssh": { + "port": 4422 + }, + "tags": ["development", "istanbul"] +} diff --git a/nodes/stonefish.json b/nodes/stonefish.json deleted file mode 100644 index 34e7ab3..0000000 --- a/nodes/stonefish.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "services": "ca", - "ip_address": "176.53.69.15", - "interface": "eth0", - "tags": "development" -} diff --git a/nodes/thrips.json b/nodes/thrips.json new file mode 100644 index 0000000..23b7a85 --- /dev/null +++ b/nodes/thrips.json @@ -0,0 +1,12 @@ +{ + "ip_address": "204.13.164.162", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "seattle"], + "couch": { + "backup": true + } + +} diff --git a/nodes/turtle.json b/nodes/turtle.json index 47ca51d..408f74c 100644 --- a/nodes/turtle.json +++ b/nodes/turtle.json @@ -1,6 +1,6 @@ { "services": [ "webapp", "monitor" ], - "tags": "production", + "tags": ["production", "istanbul"], "ip_address": "176.53.69.119", "ssh": { "port": 22 diff --git a/nodes/urchin.json b/nodes/urchin.json new file mode 100644 index 0000000..bac4ea6 --- /dev/null +++ b/nodes/urchin.json @@ -0,0 +1,11 @@ +{ + "ip_address": "176.53.69.21", + "services": ["couchdb","soledad"], + "tags": ["development", "istanbul"], + "ssh": { + "port": 4422 + }, + "couch": { + "backup": true + } +} diff --git a/nodes/vpn1.json b/nodes/vpn1.json index 5386ac5..c6e3932 100644 --- a/nodes/vpn1.json +++ b/nodes/vpn1.json @@ -1,7 +1,6 @@ { "services": "openvpn", "ip_address": "10.5.5.45", - "interface": "eth0", "openvpn": { "gateway_address": "10.5.5.46", "free_gateway_address": "10.5.5.47", diff --git a/nodes/wallaby.json b/nodes/wallaby.json new file mode 100644 index 0000000..ffb92d4 --- /dev/null +++ b/nodes/wallaby.json @@ -0,0 +1,11 @@ +{ + "ip_address": "204.13.164.57", + "tags": ["production", "seattle"], + "services": [ + "monitor", + "webapp" + ], + "webapp": { + "secure": true + } +} diff --git a/nodes/walrus.json b/nodes/walrus.json deleted file mode 100644 index 7e2020e..0000000 --- a/nodes/walrus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "services": "mx", - "ip_address": "176.53.69.18", - "ssh": { - "port": 4422 - }, - "tags": "development" -} diff --git a/nodes/wombat.json b/nodes/wombat.json new file mode 100644 index 0000000..5479002 --- /dev/null +++ b/nodes/wombat.json @@ -0,0 +1,10 @@ +{ + "ip_address": "199.119.112.20", + "tags": ["production", "dc"], + "services": [ + "monitor", + "webapp" + ], + // currently down in DC, 2013-06-27 + "enabled": false +} diff --git a/nodes/woodlouse.json b/nodes/woodlouse.json new file mode 100644 index 0000000..fa72518 --- /dev/null +++ b/nodes/woodlouse.json @@ -0,0 +1,9 @@ +{ + "ip_address": "199.119.112.2", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "dc"], + "enabled": false +} diff --git a/nodes/zebra.json b/nodes/zebra.json new file mode 100644 index 0000000..eecb5b1 --- /dev/null +++ b/nodes/zebra.json @@ -0,0 +1,7 @@ +{ + "ip_address": "199.119.112.21", + "services": "mx", + "tags": ["production", "dc"], + // currently down in DC, 2013-06-27 + "enabled": false +} |