From 60ea5be2285b7bdb7f551092bcc961d1f8ce837b Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 8 Mar 2013 12:42:20 +0100 Subject: added local vagrant node mx1 --- nodes/mx1.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 nodes/mx1.json (limited to 'nodes') diff --git a/nodes/mx1.json b/nodes/mx1.json new file mode 100644 index 0000000..c8b4067 --- /dev/null +++ b/nodes/mx1.json @@ -0,0 +1,5 @@ +{ + "services": "mx", + "ip_address": "10.5.5.51", + "interface": "eth0" +} -- cgit v1.2.3 From 0f65f607ba6d1a4140c2bfc4e85d543aeadb50af Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 8 Mar 2013 12:47:30 +0100 Subject: added local vagrant node couch2 --- nodes/couch2.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 nodes/couch2.json (limited to 'nodes') diff --git a/nodes/couch2.json b/nodes/couch2.json new file mode 100644 index 0000000..380d8df --- /dev/null +++ b/nodes/couch2.json @@ -0,0 +1,4 @@ +{ + "services": "couchdb", + "ip_address": "10.5.5.52" +} -- cgit v1.2.3 From a8f405c6dbfb3b79f1e868a7b9bae3981a01540a Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 10 Mar 2013 17:46:25 -0700 Subject: added service levels and 'ankara' location --- nodes/aligator.json | 2 +- nodes/snail.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/aligator.json b/nodes/aligator.json index cafe4c9..28d0998 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -6,7 +6,7 @@ }, "ip_address": "176.53.69.121", "interface": "eth0", - "tags": "production", + "tags": ["production", "ankara"], "openvpn": { "gateway_address": "176.53.69.123", "allow_free": false, diff --git a/nodes/snail.json b/nodes/snail.json index a973ad1..a1bdd70 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -6,7 +6,7 @@ }, "ip_address": "176.53.69.14", "interface": "eth0", - "tags": "development", + "tags": ["development", "ankara"], "openvpn": { "gateway_address": "176.53.69.19", "allow_free": false, -- cgit v1.2.3 From 4cd6e45aa4e552d3c0bd9d7eb95603a5957ebdca Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 31 Mar 2013 18:23:20 -0400 Subject: clean up ca configurations, this is no longer used --- nodes/ca1.json | 5 ----- nodes/koala.json | 6 ------ nodes/stonefish.json | 6 ------ 3 files changed, 17 deletions(-) delete mode 100644 nodes/ca1.json delete mode 100644 nodes/koala.json delete mode 100644 nodes/stonefish.json (limited to 'nodes') 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/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/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" -} -- cgit v1.2.3 From f88eecdd26ef796f4d84e37ad4c09d4b9ea4ed4e Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 1 Apr 2013 12:02:59 -0400 Subject: fix for bandwidth_rate numeric (#1894) --- nodes/aligator.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/aligator.json b/nodes/aligator.json index 28d0998..18bde0c 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -2,7 +2,8 @@ "services": [ "openvpn", "tor" ], "tor": { "type": "exit", - "nickname": "alligator" + "nickname": "alligator", + "bandwidth_rate": 3000 }, "ip_address": "176.53.69.121", "interface": "eth0", -- cgit v1.2.3 From 4711651c53a5cdab4e432d3f6089c7a3c3a52b49 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 30 Apr 2013 14:26:57 -0700 Subject: added soledad and ankara tags to couchdb nodes --- nodes/elephant.json | 4 ++-- nodes/python.json | 4 ++-- nodes/sloth.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'nodes') diff --git a/nodes/elephant.json b/nodes/elephant.json index 46cc3e6..3d425d7 100644 --- a/nodes/elephant.json +++ b/nodes/elephant.json @@ -1,6 +1,6 @@ { - "services": [ "webapp", "monitor" ], - "tags": "development", + "services": ["webapp", "monitor"], + "tags": ["development", "ankara"], "ip_address": "176.53.69.13", "ssh": { "port": 4422 diff --git a/nodes/python.json b/nodes/python.json index 783123a..2c2ec25 100644 --- a/nodes/python.json +++ b/nodes/python.json @@ -1,8 +1,8 @@ { - "services": "couchdb", + "services": ["couchdb", "soledad"], "ip_address": "176.53.69.16", "ssh": { "port": 4422 }, - "tags": "development" + "tags": ["development", "ankara"] } diff --git a/nodes/sloth.json b/nodes/sloth.json index 7ce5483..826722a 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", "ankara"] } -- cgit v1.2.3 From f741a39f960fc2f0fab042f65d7cb12eb7aa31f6 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 2 May 2013 14:37:04 -0400 Subject: remove interface json key, this is determined automatically now --- nodes/aligator.json | 1 - nodes/mx1.json | 3 +-- nodes/snail.json | 1 - nodes/vpn1.json | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) (limited to 'nodes') diff --git a/nodes/aligator.json b/nodes/aligator.json index 18bde0c..3c17d14 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -6,7 +6,6 @@ "bandwidth_rate": 3000 }, "ip_address": "176.53.69.121", - "interface": "eth0", "tags": ["production", "ankara"], "openvpn": { "gateway_address": "176.53.69.123", diff --git a/nodes/mx1.json b/nodes/mx1.json index c8b4067..ffd6149 100644 --- a/nodes/mx1.json +++ b/nodes/mx1.json @@ -1,5 +1,4 @@ { "services": "mx", - "ip_address": "10.5.5.51", - "interface": "eth0" + "ip_address": "10.5.5.51" } diff --git a/nodes/snail.json b/nodes/snail.json index a1bdd70..5b14783 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -5,7 +5,6 @@ "nickname": "snail" }, "ip_address": "176.53.69.14", - "interface": "eth0", "tags": ["development", "ankara"], "openvpn": { "gateway_address": "176.53.69.19", 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", -- cgit v1.2.3 From d7c17c4990155cc867554e98635f5b29ed67fd0c Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 15 May 2013 19:06:13 +0200 Subject: removed walrus --- nodes/walrus.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 nodes/walrus.json (limited to 'nodes') 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" -} -- cgit v1.2.3 From 3bafe0ebb27ac4e84dfeaf8153681e605c49b07e Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 15 May 2013 19:43:34 +0200 Subject: added starfish (mx) --- nodes/starfish.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/starfish.json (limited to 'nodes') diff --git a/nodes/starfish.json b/nodes/starfish.json new file mode 100644 index 0000000..08f09f4 --- /dev/null +++ b/nodes/starfish.json @@ -0,0 +1,8 @@ +{ + "ip_address": "176.53.69.19", + "services": "mx", + "ssh": { + "port": 4422 + }, + "tags": "development" +} -- cgit v1.2.3 From b645f1c4134a3e800200112d248029e36ebc86ef Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 16 May 2013 10:54:32 +0200 Subject: removed python, added urchin --- nodes/python.json | 8 -------- nodes/urchin.json | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 nodes/python.json create mode 100644 nodes/urchin.json (limited to 'nodes') diff --git a/nodes/python.json b/nodes/python.json deleted file mode 100644 index 2c2ec25..0000000 --- a/nodes/python.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "services": ["couchdb", "soledad"], - "ip_address": "176.53.69.16", - "ssh": { - "port": 4422 - }, - "tags": ["development", "ankara"] -} diff --git a/nodes/urchin.json b/nodes/urchin.json new file mode 100644 index 0000000..4569f53 --- /dev/null +++ b/nodes/urchin.json @@ -0,0 +1,11 @@ +{ + "ip_address": "176.53.69.21", + "services": [ + "couchdb", + "soledad" + ], + "ssh": { + "port": 4422 + }, + "tags": "development" +} -- cgit v1.2.3 From 26959138e1bcfaf1f2feaee497f03324a22e1347 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 16 May 2013 10:56:32 +0200 Subject: removed mole, added clam --- nodes/clam.json | 11 +++++++++++ nodes/mole.json | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 nodes/clam.json delete mode 100644 nodes/mole.json (limited to 'nodes') diff --git a/nodes/clam.json b/nodes/clam.json new file mode 100644 index 0000000..f9007a4 --- /dev/null +++ b/nodes/clam.json @@ -0,0 +1,11 @@ +{ + "ip_address": "176.53.69.22", + "services": [ + "couchdb", + "soledad" + ], + "ssh": { + "port": 4422 + }, + "tags": "development" +} 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" -} -- cgit v1.2.3 From f7a709cc420fa90ec1db010d81191d76e67e8bcd Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 21 May 2013 18:15:13 +0200 Subject: changed ip of starfish from .19 to .23 (.19 is openvpn gw ip) --- nodes/starfish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/starfish.json b/nodes/starfish.json index 08f09f4..111d524 100644 --- a/nodes/starfish.json +++ b/nodes/starfish.json @@ -1,5 +1,5 @@ { - "ip_address": "176.53.69.19", + "ip_address": "176.53.69.23", "services": "mx", "ssh": { "port": 4422 -- cgit v1.2.3 From b478dba03e4636667de7159895817e74b6518a8e Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 23 May 2013 16:25:10 -0400 Subject: add soledad service to the couchdb local nodes --- nodes/couch1.json | 5 ++++- nodes/couch2.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'nodes') 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 index 380d8df..83c564d 100644 --- a/nodes/couch2.json +++ b/nodes/couch2.json @@ -1,4 +1,7 @@ { - "services": "couchdb", + "services": [ + "couchdb", + "soledad" + ], "ip_address": "10.5.5.52" } -- cgit v1.2.3 From 9a6dd34e60dcb39a241659f6eb89859aee63ae56 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 27 May 2013 15:08:10 -0700 Subject: disabled all istanbul nodes --- nodes/aligator.json | 2 +- nodes/clam.json | 2 +- nodes/elephant.json | 2 +- nodes/sloth.json | 2 +- nodes/slug.json | 2 +- nodes/snail.json | 2 +- nodes/starfish.json | 2 +- nodes/turtle.json | 2 +- nodes/urchin.json | 9 +++------ 9 files changed, 11 insertions(+), 14 deletions(-) (limited to 'nodes') diff --git a/nodes/aligator.json b/nodes/aligator.json index 3c17d14..c50cfd8 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -6,7 +6,7 @@ "bandwidth_rate": 3000 }, "ip_address": "176.53.69.121", - "tags": ["production", "ankara"], + "tags": ["production", "istanbul"], "openvpn": { "gateway_address": "176.53.69.123", "allow_free": false, diff --git a/nodes/clam.json b/nodes/clam.json index f9007a4..b9e5f66 100644 --- a/nodes/clam.json +++ b/nodes/clam.json @@ -7,5 +7,5 @@ "ssh": { "port": 4422 }, - "tags": "development" + "tags": ["development", "istanbul"] } diff --git a/nodes/elephant.json b/nodes/elephant.json index 3d425d7..d9626e2 100644 --- a/nodes/elephant.json +++ b/nodes/elephant.json @@ -1,6 +1,6 @@ { "services": ["webapp", "monitor"], - "tags": ["development", "ankara"], + "tags": ["development", "istanbul"], "ip_address": "176.53.69.13", "ssh": { "port": 4422 diff --git a/nodes/sloth.json b/nodes/sloth.json index 826722a..fc9cb88 100644 --- a/nodes/sloth.json +++ b/nodes/sloth.json @@ -4,5 +4,5 @@ "ssh": { "port": 4422 }, - "tags": ["production", "ankara"] + "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 5b14783..6d4b4f7 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -5,7 +5,7 @@ "nickname": "snail" }, "ip_address": "176.53.69.14", - "tags": ["development", "ankara"], + "tags": ["development", "istanbul"], "openvpn": { "gateway_address": "176.53.69.19", "allow_free": false, diff --git a/nodes/starfish.json b/nodes/starfish.json index 111d524..721a996 100644 --- a/nodes/starfish.json +++ b/nodes/starfish.json @@ -4,5 +4,5 @@ "ssh": { "port": 4422 }, - "tags": "development" + "tags": ["development", "istanbul"] } 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 index 4569f53..ae451dc 100644 --- a/nodes/urchin.json +++ b/nodes/urchin.json @@ -1,11 +1,8 @@ { "ip_address": "176.53.69.21", - "services": [ - "couchdb", - "soledad" - ], + "services": ["couchdb","soledad"], + "tags": ["development", "istanbul"], "ssh": { "port": 4422 - }, - "tags": "development" + } } -- cgit v1.2.3 From ab18f6f664a8cf98d1f05ee27964a3ea83a1e6db Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 27 May 2013 20:27:10 -0700 Subject: added nodes canvasback, gadwall, harrier --- nodes/canvasback.json | 5 +++++ nodes/gadwall.json | 10 ++++++++++ nodes/harrier.json | 10 ++++++++++ 3 files changed, 25 insertions(+) create mode 100644 nodes/canvasback.json create mode 100644 nodes/gadwall.json create mode 100644 nodes/harrier.json (limited to 'nodes') diff --git a/nodes/canvasback.json b/nodes/canvasback.json new file mode 100644 index 0000000..65414d6 --- /dev/null +++ b/nodes/canvasback.json @@ -0,0 +1,5 @@ +{ + "services": "webapp", + "tags": [ "development", "dc" ], + "ip_address": "199.119.112.4" +} diff --git a/nodes/gadwall.json b/nodes/gadwall.json new file mode 100644 index 0000000..16c0032 --- /dev/null +++ b/nodes/gadwall.json @@ -0,0 +1,10 @@ +{ + "services": ["couchdb", "soledad"], + "tags": [ "development", "dc" ], + "ip_address": "199.119.112.5" + //"openvpn": { + // "gateway_address": "199.119.112.6", + // "second_gateway_address": "199.119.112.7" + //} +} + diff --git a/nodes/harrier.json b/nodes/harrier.json new file mode 100644 index 0000000..5d3128a --- /dev/null +++ b/nodes/harrier.json @@ -0,0 +1,10 @@ +{ + "services": "openvpn", + "tags": [ "development", "seattle" ], + "ip_address": "198.252.153.46", + "openvpn": { + "gateway_address": "199.254.238.50", + "second_gateway_address": "199.254.238.51" + } +} + -- cgit v1.2.3 From 59d41781776d9b7f2602c8aaaeda8491a9092063 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 28 May 2013 14:53:30 -0400 Subject: disable gadwall and canvasback so client development can happen on them --- nodes/canvasback.json | 3 ++- nodes/gadwall.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/canvasback.json b/nodes/canvasback.json index 65414d6..ae8cfc0 100644 --- a/nodes/canvasback.json +++ b/nodes/canvasback.json @@ -1,5 +1,6 @@ { "services": "webapp", "tags": [ "development", "dc" ], - "ip_address": "199.119.112.4" + "ip_address": "199.119.112.4", + "enabled": false } diff --git a/nodes/gadwall.json b/nodes/gadwall.json index 16c0032..b283d45 100644 --- a/nodes/gadwall.json +++ b/nodes/gadwall.json @@ -1,7 +1,8 @@ { "services": ["couchdb", "soledad"], "tags": [ "development", "dc" ], - "ip_address": "199.119.112.5" + "ip_address": "199.119.112.5", + "enabled": false //"openvpn": { // "gateway_address": "199.119.112.6", // "second_gateway_address": "199.119.112.7" -- cgit v1.2.3 From 3d858938850463dfd50f6f9eff6d3f3e6842f66b Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 30 May 2013 12:28:06 -0700 Subject: added environment 'clientdev' --- nodes/canvasback.json | 6 ++++-- nodes/gadwall.json | 6 ++++-- nodes/harrier.json | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'nodes') diff --git a/nodes/canvasback.json b/nodes/canvasback.json index ae8cfc0..9b98845 100644 --- a/nodes/canvasback.json +++ b/nodes/canvasback.json @@ -1,6 +1,8 @@ { "services": "webapp", - "tags": [ "development", "dc" ], + "tags": ["clientdev", "dc"], "ip_address": "199.119.112.4", - "enabled": false + "ssh": { + "port": 4422 + } } diff --git a/nodes/gadwall.json b/nodes/gadwall.json index b283d45..fe19da8 100644 --- a/nodes/gadwall.json +++ b/nodes/gadwall.json @@ -1,8 +1,10 @@ { "services": ["couchdb", "soledad"], - "tags": [ "development", "dc" ], + "tags": ["clientdev", "dc"], "ip_address": "199.119.112.5", - "enabled": false + "ssh": { + "port": 4422 + } //"openvpn": { // "gateway_address": "199.119.112.6", // "second_gateway_address": "199.119.112.7" diff --git a/nodes/harrier.json b/nodes/harrier.json index 5d3128a..7e0a75a 100644 --- a/nodes/harrier.json +++ b/nodes/harrier.json @@ -1,10 +1,13 @@ { "services": "openvpn", - "tags": [ "development", "seattle" ], + "tags": ["clientdev", "seattle"], "ip_address": "198.252.153.46", "openvpn": { "gateway_address": "199.254.238.50", "second_gateway_address": "199.254.238.51" + }, + "ssh": { + "port": 4422 } } -- cgit v1.2.3 From 99b287bffac99842a62ef2f1bc4a962ef21390b0 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 4 Jun 2013 11:19:45 -0700 Subject: changed clientdev domain from dev.bitmask.net to cdev.bitmask.net --- nodes/canvasback.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/canvasback.json b/nodes/canvasback.json index 9b98845..b3a8deb 100644 --- a/nodes/canvasback.json +++ b/nodes/canvasback.json @@ -3,6 +3,6 @@ "tags": ["clientdev", "dc"], "ip_address": "199.119.112.4", "ssh": { - "port": 4422 + "port": 22 } } -- cgit v1.2.3 From fc41a01cda66620627fae76d125d044a05d31a33 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 4 Jun 2013 23:11:34 -0700 Subject: set port back to 22 --- nodes/gadwall.json | 2 +- nodes/harrier.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/gadwall.json b/nodes/gadwall.json index fe19da8..8d0f988 100644 --- a/nodes/gadwall.json +++ b/nodes/gadwall.json @@ -3,7 +3,7 @@ "tags": ["clientdev", "dc"], "ip_address": "199.119.112.5", "ssh": { - "port": 4422 + "port": 22 } //"openvpn": { // "gateway_address": "199.119.112.6", diff --git a/nodes/harrier.json b/nodes/harrier.json index 7e0a75a..84652b9 100644 --- a/nodes/harrier.json +++ b/nodes/harrier.json @@ -7,7 +7,7 @@ "second_gateway_address": "199.254.238.51" }, "ssh": { - "port": 4422 + "port": 22 } } -- cgit v1.2.3 From c552bfd095b3a1c9a2e15df5330201713ce5a6b8 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 8 Jun 2013 01:04:38 -0700 Subject: added and initialized dc production nodes (snake, wombat, zebra) --- nodes/snake.json | 8 ++++++++ nodes/wombat.json | 8 ++++++++ nodes/zebra.json | 5 +++++ 3 files changed, 21 insertions(+) create mode 100644 nodes/snake.json create mode 100644 nodes/wombat.json create mode 100644 nodes/zebra.json (limited to 'nodes') diff --git a/nodes/snake.json b/nodes/snake.json new file mode 100644 index 0000000..2a4fe19 --- /dev/null +++ b/nodes/snake.json @@ -0,0 +1,8 @@ +{ + "ip_address": "199.119.112.22", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "dc"] +} diff --git a/nodes/wombat.json b/nodes/wombat.json new file mode 100644 index 0000000..e99df3d --- /dev/null +++ b/nodes/wombat.json @@ -0,0 +1,8 @@ +{ + "ip_address": "199.119.112.20", + "tags": ["production", "dc"], + "services": [ + "monitor", + "webapp" + ] +} diff --git a/nodes/zebra.json b/nodes/zebra.json new file mode 100644 index 0000000..4d27994 --- /dev/null +++ b/nodes/zebra.json @@ -0,0 +1,5 @@ +{ + "ip_address": "199.119.112.21", + "services": "mx", + "tags": ["production", "dc"] +} -- cgit v1.2.3 From 94551ff71da32b45d6a7927bf60807a98a97475b Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 8 Jun 2013 01:05:10 -0700 Subject: added placeholders for pp and hk nodes, but not initialized yet. --- nodes/beetle.json | 8 ++++++++ nodes/dolphin.json | 11 +++++++++++ nodes/worm.json | 8 ++++++++ 3 files changed, 27 insertions(+) create mode 100644 nodes/beetle.json create mode 100644 nodes/dolphin.json create mode 100644 nodes/worm.json (limited to 'nodes') diff --git a/nodes/beetle.json b/nodes/beetle.json new file mode 100644 index 0000000..47a9eee --- /dev/null +++ b/nodes/beetle.json @@ -0,0 +1,8 @@ +{ + "ip_address": "1.1.1.1", + "tags": ["production", "hongkong"], + "services": "openvpn", + "openvpn": { + "gateway_address": "2.2.2.2" + } +} 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/worm.json b/nodes/worm.json new file mode 100644 index 0000000..0970e94 --- /dev/null +++ b/nodes/worm.json @@ -0,0 +1,8 @@ +{ + "ip_address": "1.1.1.1", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "hongkong"] +} -- cgit v1.2.3 From b0e3ce2d7e2eae6796966c176d4dcee84de02841 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 11 Jun 2013 16:34:10 +0200 Subject: Add beetle + worm's IPs to bitmask (Feature #2810) --- nodes/beetle.json | 4 ++-- nodes/worm.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nodes') diff --git a/nodes/beetle.json b/nodes/beetle.json index 47a9eee..e027c18 100644 --- a/nodes/beetle.json +++ b/nodes/beetle.json @@ -1,8 +1,8 @@ { - "ip_address": "1.1.1.1", + "ip_address": "202.85.227.195", "tags": ["production", "hongkong"], "services": "openvpn", "openvpn": { - "gateway_address": "2.2.2.2" + "gateway_address": "202.85.227.196" } } diff --git a/nodes/worm.json b/nodes/worm.json index 0970e94..7ad3ec2 100644 --- a/nodes/worm.json +++ b/nodes/worm.json @@ -1,5 +1,5 @@ { - "ip_address": "1.1.1.1", + "ip_address": "202.85.227.194", "services": [ "couchdb", "soledad" -- cgit v1.2.3 From 21787dfd543c445e70933348ec40d4a1f7587403 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 11 Jun 2013 08:05:49 -0700 Subject: note third ip for beetle --- nodes/beetle.json | 1 + 1 file changed, 1 insertion(+) (limited to 'nodes') diff --git a/nodes/beetle.json b/nodes/beetle.json index e027c18..5be0ae0 100644 --- a/nodes/beetle.json +++ b/nodes/beetle.json @@ -4,5 +4,6 @@ "services": "openvpn", "openvpn": { "gateway_address": "202.85.227.196" + // secondary_address 202.85.227.197 } } -- cgit v1.2.3 From b44c41c4c76dbd59d3756bde5d001c6c9ea3d905 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 13 Jun 2013 17:29:45 +0200 Subject: disable tor on alligator + snail --- nodes/aligator.json | 7 +------ nodes/snail.json | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'nodes') diff --git a/nodes/aligator.json b/nodes/aligator.json index c50cfd8..b5a2e5e 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -1,10 +1,5 @@ { - "services": [ "openvpn", "tor" ], - "tor": { - "type": "exit", - "nickname": "alligator", - "bandwidth_rate": 3000 - }, + "services": "openvpn", "ip_address": "176.53.69.121", "tags": ["production", "istanbul"], "openvpn": { diff --git a/nodes/snail.json b/nodes/snail.json index 6d4b4f7..59427de 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -1,9 +1,5 @@ { - "services": [ "openvpn", "tor" ], - "tor": { - "type": "exit", - "nickname": "snail" - }, + "services": "openvpn", "ip_address": "176.53.69.14", "tags": ["development", "istanbul"], "openvpn": { -- cgit v1.2.3 From 885f4601e1b5c667cbd3c4f11d897815e29b3b86 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 18 Jun 2013 16:13:49 +0200 Subject: snail: ssh port 4422 --- nodes/snail.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nodes') diff --git a/nodes/snail.json b/nodes/snail.json index 59427de..98ea6d1 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -6,5 +6,8 @@ "gateway_address": "176.53.69.19", "allow_free": false, "filter_dns": true + }, + "ssh": { + "port": 4422 } } -- cgit v1.2.3 From ec49e32c6b540d72596fefa90ba091f253847259 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 27 Jun 2013 10:31:55 +0200 Subject: added nodes/wallaby.json, disabled wombat (currently down) --- nodes/wallaby.json | 8 ++++++++ nodes/wombat.json | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 nodes/wallaby.json (limited to 'nodes') diff --git a/nodes/wallaby.json b/nodes/wallaby.json new file mode 100644 index 0000000..d87c3dc --- /dev/null +++ b/nodes/wallaby.json @@ -0,0 +1,8 @@ +{ + "ip_address": "204.13.164.57", + "tags": ["production", "seattle"], + "services": [ + "monitor", + "webapp" + ] +} diff --git a/nodes/wombat.json b/nodes/wombat.json index e99df3d..9731db4 100644 --- a/nodes/wombat.json +++ b/nodes/wombat.json @@ -4,5 +4,7 @@ "services": [ "monitor", "webapp" - ] + ], + // currently down in DC, 2013-06-27 + "enabled": "false" } -- cgit v1.2.3 From c6678ceca69fcffc594e19285981c7125ee323f5 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 27 Jun 2013 12:49:35 +0200 Subject: disabled DC nodes snake + zebra, they are down atm --- nodes/snake.json | 4 +++- nodes/zebra.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/snake.json b/nodes/snake.json index 2a4fe19..3767c43 100644 --- a/nodes/snake.json +++ b/nodes/snake.json @@ -4,5 +4,7 @@ "couchdb", "soledad" ], - "tags": ["production", "dc"] + "tags": ["production", "dc"], + // currently down in DC, 2013-06-27 + "enabled": "false" } diff --git a/nodes/zebra.json b/nodes/zebra.json index 4d27994..d6a73ee 100644 --- a/nodes/zebra.json +++ b/nodes/zebra.json @@ -1,5 +1,7 @@ { "ip_address": "199.119.112.21", "services": "mx", - "tags": ["production", "dc"] + "tags": ["production", "dc"], + // currently down in DC, 2013-06-27 + "enabled": "false" } -- cgit v1.2.3 From 4b350ba7044b3c993e83233cc9add0ff89589fdc Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 27 Jun 2013 19:03:27 +0200 Subject: added giraffe, couchdb production server --- nodes/giraffe.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/giraffe.json (limited to 'nodes') diff --git a/nodes/giraffe.json b/nodes/giraffe.json new file mode 100644 index 0000000..0baf822 --- /dev/null +++ b/nodes/giraffe.json @@ -0,0 +1,8 @@ +{ + "ip_address": "202.85.227.221", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "hongkong"] +} -- cgit v1.2.3 From 374e250db191b87c2ede4022d33ad829862c3481 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 1 Jul 2013 17:18:11 +0200 Subject: added manatee (couchdb production node in pp) --- nodes/manatee.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/manatee.json (limited to 'nodes') diff --git a/nodes/manatee.json b/nodes/manatee.json new file mode 100644 index 0000000..abab835 --- /dev/null +++ b/nodes/manatee.json @@ -0,0 +1,8 @@ +{ + "ip_address": "223.223.175.4", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "phnompenh"] +} -- cgit v1.2.3 From e0f8f2765ff33304a007e49656fbf49c2544f23e Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 1 Jul 2013 18:54:56 +0200 Subject: disabled giraffe --- nodes/giraffe.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/giraffe.json b/nodes/giraffe.json index 0baf822..54c7160 100644 --- a/nodes/giraffe.json +++ b/nodes/giraffe.json @@ -4,5 +4,6 @@ "couchdb", "soledad" ], - "tags": ["production", "hongkong"] + "tags": ["production", "hongkong"], + "enabled": "false" } -- cgit v1.2.3 From 861a3801cc4d2aa3e88b3f439aecfe51032430ec Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 5 Jul 2013 14:19:12 -0700 Subject: added hippo node --- nodes/hippo.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 nodes/hippo.json (limited to 'nodes') diff --git a/nodes/hippo.json b/nodes/hippo.json new file mode 100644 index 0000000..1f152ff --- /dev/null +++ b/nodes/hippo.json @@ -0,0 +1,12 @@ +{ + "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 + } +} -- cgit v1.2.3 From 83aaec97ca5e2c29cc67e447e7f896c14c704589 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sat, 6 Jul 2013 00:20:20 +0200 Subject: enable exit --- nodes/hippo.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/hippo.json b/nodes/hippo.json index 1f152ff..302d75c 100644 --- a/nodes/hippo.json +++ b/nodes/hippo.json @@ -7,6 +7,8 @@ }, "tor": { // KB/s - "bandwidth_rate": 100 + "bandwidth_rate": 100, + "type": "exit", + "nickname": "hippo" } } -- cgit v1.2.3 From bf41fef58919f7df8f2f6322dfa46c35316605e1 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Wed, 17 Jul 2013 14:43:34 +0200 Subject: adding woodlouse couchdb in DC --- nodes/woodlouse.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 nodes/woodlouse.json (limited to 'nodes') diff --git a/nodes/woodlouse.json b/nodes/woodlouse.json new file mode 100644 index 0000000..7fda8fe --- /dev/null +++ b/nodes/woodlouse.json @@ -0,0 +1,5 @@ +{ + "couchdb2": null, + "ip_address": "199.119.112.2", + "services": "couchdb" +} -- cgit v1.2.3 From 0c500ecf89940d050b29dad32f3d3b19cf30e5dc Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 17 Jul 2013 15:48:04 +0200 Subject: updated woodlouse: added DC + production tags --- nodes/woodlouse.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/woodlouse.json b/nodes/woodlouse.json index 7fda8fe..79f679a 100644 --- a/nodes/woodlouse.json +++ b/nodes/woodlouse.json @@ -1,5 +1,8 @@ { - "couchdb2": null, "ip_address": "199.119.112.2", - "services": "couchdb" + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "phnompenh"] } -- cgit v1.2.3 From 8e4c1a77c5e2e94149f67bc94cfc2ddbf5ad452f Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Thu, 18 Jul 2013 17:07:57 +0200 Subject: woodlouse is not in Phnom Penh, but dc --- nodes/woodlouse.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/woodlouse.json b/nodes/woodlouse.json index 79f679a..19fa450 100644 --- a/nodes/woodlouse.json +++ b/nodes/woodlouse.json @@ -4,5 +4,5 @@ "couchdb", "soledad" ], - "tags": ["production", "phnompenh"] + "tags": ["production", "dc"] } -- cgit v1.2.3 From f3bc23702501e45f9dd3e5233665be10f78dc139 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 24 Jul 2013 13:00:59 -0700 Subject: minor: add link to check on hippo tor node --- nodes/hippo.json | 1 + 1 file changed, 1 insertion(+) (limited to 'nodes') diff --git a/nodes/hippo.json b/nodes/hippo.json index 302d75c..79f295c 100644 --- a/nodes/hippo.json +++ b/nodes/hippo.json @@ -1,3 +1,4 @@ +// http://torstatus.blutmagie.de/router_detail.php?FP=855b6cfe6c20a48cf1b815b87d565df6ea93e74a { "ip_address": "85.17.92.143", "services": ["openvpn","tor"], -- cgit v1.2.3 From 547df22b1bb46a8f9eaff9079102e30151aa6d5d Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 29 Jul 2013 21:07:25 -0700 Subject: disable woodlouse --- nodes/woodlouse.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/woodlouse.json b/nodes/woodlouse.json index 19fa450..fa72518 100644 --- a/nodes/woodlouse.json +++ b/nodes/woodlouse.json @@ -4,5 +4,6 @@ "couchdb", "soledad" ], - "tags": ["production", "dc"] + "tags": ["production", "dc"], + "enabled": false } -- cgit v1.2.3 From 7fa214ff25c60e12760e627ec418dad35044de16 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 29 Jul 2013 22:39:21 -0700 Subject: security - set admins and force hsts for https://bitmask.net --- nodes/wallaby.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/wallaby.json b/nodes/wallaby.json index d87c3dc..ffb92d4 100644 --- a/nodes/wallaby.json +++ b/nodes/wallaby.json @@ -4,5 +4,8 @@ "services": [ "monitor", "webapp" - ] + ], + "webapp": { + "secure": true + } } -- cgit v1.2.3 From 582086f2835982d69a7f50adf97b96f5c038b4fc Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 7 Aug 2013 10:19:34 -0700 Subject: added nodes ant and millipede --- nodes/ant.json | 8 ++++++++ nodes/millipede.json | 11 +++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nodes/ant.json create mode 100644 nodes/millipede.json (limited to 'nodes') diff --git a/nodes/ant.json b/nodes/ant.json new file mode 100644 index 0000000..192585c --- /dev/null +++ b/nodes/ant.json @@ -0,0 +1,8 @@ +{ + "ip_address": "198.252.153.82", + "services": "couchdb", + "tags": [ + "production", + "seattle" + ] +} diff --git a/nodes/millipede.json b/nodes/millipede.json new file mode 100644 index 0000000..9534fc7 --- /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", + "tags": [ + "production", + "seattle" + ] +} -- cgit v1.2.3 From 99d2cdd0e41bb42f96084b0051d2aabb0751c0ae Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 8 Aug 2013 02:39:02 -0700 Subject: disabling ant, because it is buggy as hell --- nodes/ant.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/ant.json b/nodes/ant.json index 192585c..d10585c 100644 --- a/nodes/ant.json +++ b/nodes/ant.json @@ -4,5 +4,6 @@ "tags": [ "production", "seattle" - ] + ], + "enabled": false } -- cgit v1.2.3 From 0f4dca0ee0f1dc172a05a5a1cea11682398b84d8 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 13 Aug 2013 18:50:00 +0200 Subject: disabled manatee, cause it will be gone next week during pp upgrade, and to test if a 3-node bigcouch setup causes problems on ant --- nodes/manatee.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/manatee.json b/nodes/manatee.json index abab835..4a4d68d 100644 --- a/nodes/manatee.json +++ b/nodes/manatee.json @@ -4,5 +4,6 @@ "couchdb", "soledad" ], - "tags": ["production", "phnompenh"] + "tags": ["production", "phnompenh"], + "enabled": false } -- cgit v1.2.3 From 628879d8bf2f2c78fe7cd65ea1d2ab9a77a3b503 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 13 Aug 2013 18:50:23 +0200 Subject: re-added ant for debugging --- nodes/ant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/ant.json b/nodes/ant.json index d10585c..b5d3373 100644 --- a/nodes/ant.json +++ b/nodes/ant.json @@ -5,5 +5,5 @@ "production", "seattle" ], - "enabled": false + "enabled": true } -- cgit v1.2.3 From a575b9ca5a809a4bb2fc4d5be911198a822a7618 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 14 Aug 2013 16:00:42 +0200 Subject: take out ant's location, fake worm's locatin to be in seatte --- nodes/ant.json | 3 +-- nodes/worm.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'nodes') diff --git a/nodes/ant.json b/nodes/ant.json index b5d3373..1951378 100644 --- a/nodes/ant.json +++ b/nodes/ant.json @@ -2,8 +2,7 @@ "ip_address": "198.252.153.82", "services": "couchdb", "tags": [ - "production", - "seattle" + "production" ], "enabled": true } diff --git a/nodes/worm.json b/nodes/worm.json index 7ad3ec2..7e3f733 100644 --- a/nodes/worm.json +++ b/nodes/worm.json @@ -4,5 +4,5 @@ "couchdb", "soledad" ], - "tags": ["production", "hongkong"] + "tags": ["production", "seattle"] } -- cgit v1.2.3 From e13eaa88a2337bbe603668e84dc70810bb6f177d Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 14 Aug 2013 17:01:29 +0200 Subject: added elk as production couch node --- nodes/elk.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/elk.json (limited to 'nodes') diff --git a/nodes/elk.json b/nodes/elk.json new file mode 100644 index 0000000..0f0e806 --- /dev/null +++ b/nodes/elk.json @@ -0,0 +1,8 @@ +{ + "ip_address": "204.13.164.252", + "services": "couchdb", + "tags": [ + "production" + ], + "enabled": true +} -- cgit v1.2.3 From 1a2b373e3c6b9181634329885aff73affa862e3e Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 15 Aug 2013 13:11:03 +0200 Subject: elk: couch slow, moving to development for further debugging --- nodes/elk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/elk.json b/nodes/elk.json index 0f0e806..f6586ba 100644 --- a/nodes/elk.json +++ b/nodes/elk.json @@ -2,7 +2,7 @@ "ip_address": "204.13.164.252", "services": "couchdb", "tags": [ - "production" + "development" ], "enabled": true } -- cgit v1.2.3 From 14d3a720d8483aeb145d872aad9d8016c4bfe3e9 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 22 Aug 2013 14:48:16 +0200 Subject: Revert "take out ant's location, fake worm's locatin to be in seatte" This reverts commit a575b9ca5a809a4bb2fc4d5be911198a822a7618. cluster is rebalanced, see #3412 (Resolved): couchdb performance --- nodes/ant.json | 3 ++- nodes/worm.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/ant.json b/nodes/ant.json index 1951378..b5d3373 100644 --- a/nodes/ant.json +++ b/nodes/ant.json @@ -2,7 +2,8 @@ "ip_address": "198.252.153.82", "services": "couchdb", "tags": [ - "production" + "production", + "seattle" ], "enabled": true } diff --git a/nodes/worm.json b/nodes/worm.json index 7e3f733..7ad3ec2 100644 --- a/nodes/worm.json +++ b/nodes/worm.json @@ -4,5 +4,5 @@ "couchdb", "soledad" ], - "tags": ["production", "seattle"] + "tags": ["production", "hongkong"] } -- cgit v1.2.3 From 9c66af88c99e5681943e782bcf6fe341d01e6fd6 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 28 Aug 2013 11:41:24 +0200 Subject: added leech (production mx node), vm on toad (seattle) --- nodes/leech.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/leech.json (limited to 'nodes') 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" + ] +} -- cgit v1.2.3 From 3b7f3c38a73f49be44bc9f5167d172a558929863 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 4 Sep 2013 08:17:08 +0200 Subject: added thrips, removed worm (#3697) --- nodes/thrips.json | 8 ++++++++ nodes/worm.json | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 nodes/thrips.json (limited to 'nodes') diff --git a/nodes/thrips.json b/nodes/thrips.json new file mode 100644 index 0000000..e5ac68d --- /dev/null +++ b/nodes/thrips.json @@ -0,0 +1,8 @@ +{ + "ip_address": "204.13.164.162", + "services": [ + "couchdb", + "soledad" + ], + "tags": ["production", "seattle"] +} diff --git a/nodes/worm.json b/nodes/worm.json index 7ad3ec2..edb6b7a 100644 --- a/nodes/worm.json +++ b/nodes/worm.json @@ -4,5 +4,6 @@ "couchdb", "soledad" ], - "tags": ["production", "hongkong"] + "tags": ["production", "hongkong"], + "enabled": false } -- cgit v1.2.3 From cc6a1d63459a924cdc0e2e7e7098dc00b56b259e Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 6 Sep 2013 09:02:10 +0200 Subject: added vagrant node plain1, for testing basic deployment on nodes without service configured --- nodes/plain1.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 nodes/plain1.json (limited to 'nodes') 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" +} -- cgit v1.2.3 From 36106b5a21cfb8dbe1c46a85fa2e6c9a33027b6a Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 23 Sep 2013 16:59:52 +0200 Subject: removed giraffe + manatee (#3911) --- nodes/giraffe.json | 9 --------- nodes/manatee.json | 9 --------- 2 files changed, 18 deletions(-) delete mode 100644 nodes/giraffe.json delete mode 100644 nodes/manatee.json (limited to 'nodes') diff --git a/nodes/giraffe.json b/nodes/giraffe.json deleted file mode 100644 index 54c7160..0000000 --- a/nodes/giraffe.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ip_address": "202.85.227.221", - "services": [ - "couchdb", - "soledad" - ], - "tags": ["production", "hongkong"], - "enabled": "false" -} diff --git a/nodes/manatee.json b/nodes/manatee.json deleted file mode 100644 index 4a4d68d..0000000 --- a/nodes/manatee.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ip_address": "223.223.175.4", - "services": [ - "couchdb", - "soledad" - ], - "tags": ["production", "phnompenh"], - "enabled": false -} -- cgit v1.2.3 From 87f50e55e95b80cfb48fec64f6fe440622fe324e Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 23 Sep 2013 17:09:08 +0200 Subject: removed worm (#3911) --- nodes/worm.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 nodes/worm.json (limited to 'nodes') diff --git a/nodes/worm.json b/nodes/worm.json deleted file mode 100644 index edb6b7a..0000000 --- a/nodes/worm.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ip_address": "202.85.227.194", - "services": [ - "couchdb", - "soledad" - ], - "tags": ["production", "hongkong"], - "enabled": false -} -- cgit v1.2.3 From 223e3a9f97dce9b4688207b7bc803bf6131191c4 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 24 Sep 2013 08:35:05 +0200 Subject: disable nagios on wallaby+elephant because of #3909 --- nodes/elephant.json | 3 ++- nodes/wallaby.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/elephant.json b/nodes/elephant.json index d9626e2..6289a6a 100644 --- a/nodes/elephant.json +++ b/nodes/elephant.json @@ -1,5 +1,6 @@ { - "services": ["webapp", "monitor"], + //"services": ["webapp", "monitor"], + "services": ["webapp"], "tags": ["development", "istanbul"], "ip_address": "176.53.69.13", "ssh": { diff --git a/nodes/wallaby.json b/nodes/wallaby.json index ffb92d4..9bb2a8b 100644 --- a/nodes/wallaby.json +++ b/nodes/wallaby.json @@ -2,7 +2,7 @@ "ip_address": "204.13.164.57", "tags": ["production", "seattle"], "services": [ - "monitor", + //"monitor", "webapp" ], "webapp": { -- cgit v1.2.3 From 934466709ef985ed81f95288d1b3a35f7deb18ae Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 25 Sep 2013 11:07:59 -0400 Subject: add seattle tag to elk --- nodes/elk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/elk.json b/nodes/elk.json index f6586ba..a287b6f 100644 --- a/nodes/elk.json +++ b/nodes/elk.json @@ -2,7 +2,7 @@ "ip_address": "204.13.164.252", "services": "couchdb", "tags": [ - "development" + "development", "seattle" ], "enabled": true } -- cgit v1.2.3 From fc786dd0335573464e2d72af4d3920068b001812 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 21 Oct 2013 17:46:58 +0200 Subject: re-enabled monitor service --- nodes/elephant.json | 3 +-- nodes/wallaby.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'nodes') diff --git a/nodes/elephant.json b/nodes/elephant.json index 6289a6a..d9626e2 100644 --- a/nodes/elephant.json +++ b/nodes/elephant.json @@ -1,6 +1,5 @@ { - //"services": ["webapp", "monitor"], - "services": ["webapp"], + "services": ["webapp", "monitor"], "tags": ["development", "istanbul"], "ip_address": "176.53.69.13", "ssh": { diff --git a/nodes/wallaby.json b/nodes/wallaby.json index 9bb2a8b..ffb92d4 100644 --- a/nodes/wallaby.json +++ b/nodes/wallaby.json @@ -2,7 +2,7 @@ "ip_address": "204.13.164.57", "tags": ["production", "seattle"], "services": [ - //"monitor", + "monitor", "webapp" ], "webapp": { -- cgit v1.2.3 From 7466c114a9dbd8e60804dd7f29fa8c824f28be7b Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Oct 2013 15:17:47 -0400 Subject: dispose of harrier - #4081 --- nodes/harrier.json | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 nodes/harrier.json (limited to 'nodes') diff --git a/nodes/harrier.json b/nodes/harrier.json deleted file mode 100644 index 84652b9..0000000 --- a/nodes/harrier.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "services": "openvpn", - "tags": ["clientdev", "seattle"], - "ip_address": "198.252.153.46", - "openvpn": { - "gateway_address": "199.254.238.50", - "second_gateway_address": "199.254.238.51" - }, - "ssh": { - "port": 22 - } -} - -- cgit v1.2.3 From 8218df4bfe4ad7ebf97e0b54fc09e0b4ae50c401 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 25 Oct 2013 22:32:14 +0200 Subject: added chipmonk, new ssh fingerprint for gadwall (4257) --- nodes/chipmonk.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 nodes/chipmonk.json (limited to 'nodes') 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 + } +} + -- cgit v1.2.3 From e199072f6a34dc8b98aea89c1f6770d13443d01b Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 1 Nov 2013 17:02:58 +0100 Subject: enable local couch backup on thrips and urchin --- nodes/thrips.json | 6 +++++- nodes/urchin.json | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/thrips.json b/nodes/thrips.json index e5ac68d..23b7a85 100644 --- a/nodes/thrips.json +++ b/nodes/thrips.json @@ -4,5 +4,9 @@ "couchdb", "soledad" ], - "tags": ["production", "seattle"] + "tags": ["production", "seattle"], + "couch": { + "backup": true + } + } diff --git a/nodes/urchin.json b/nodes/urchin.json index ae451dc..bac4ea6 100644 --- a/nodes/urchin.json +++ b/nodes/urchin.json @@ -4,5 +4,8 @@ "tags": ["development", "istanbul"], "ssh": { "port": 4422 + }, + "couch": { + "backup": true } } -- cgit v1.2.3 From 113e8a6c53ae9acf76d0295a970a5c93e2878956 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 1 Nov 2013 18:21:47 +0100 Subject: added demodex backup server for dev.bm and bm --- nodes/demodex.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/demodex.json (limited to 'nodes') diff --git a/nodes/demodex.json b/nodes/demodex.json new file mode 100644 index 0000000..5c4e396 --- /dev/null +++ b/nodes/demodex.json @@ -0,0 +1,8 @@ +{ + "ip_address": "204.13.164.171", + "services": ["backup"], + "tags": ["production", "development", "seattle"], + "ssh": { + "port": 4422 + } +} -- cgit v1.2.3 From 8bee6d3ce87c3f878022884fa9f3a8380be7eafd Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 4 Nov 2013 00:33:48 +0100 Subject: add tor dev server (needs deploy) --- nodes/rhino.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nodes/rhino.json (limited to 'nodes') diff --git a/nodes/rhino.json b/nodes/rhino.json new file mode 100644 index 0000000..45e0962 --- /dev/null +++ b/nodes/rhino.json @@ -0,0 +1,8 @@ +{ + "ip_address": "202.85.227.204", + "services": "tor", + "tags": [ + "development", + "hongkong" + ] +} -- cgit v1.2.3 From 938528cc387a453ba3a71a596dba6a404999b09d Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 9 Nov 2013 20:34:22 +0100 Subject: changed demodex port to 22 --- nodes/demodex.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/demodex.json b/nodes/demodex.json index 5c4e396..79b96b1 100644 --- a/nodes/demodex.json +++ b/nodes/demodex.json @@ -3,6 +3,6 @@ "services": ["backup"], "tags": ["production", "development", "seattle"], "ssh": { - "port": 4422 + "port": 22 } } -- cgit v1.2.3 From 4f9fdd82794a43d6e2b7386fca00736d2f94a60c Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sat, 9 Nov 2013 20:37:51 +0100 Subject: add tor bandwidth limitation and nickname rhino --- nodes/rhino.json | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'nodes') diff --git a/nodes/rhino.json b/nodes/rhino.json index 45e0962..84ff11f 100644 --- a/nodes/rhino.json +++ b/nodes/rhino.json @@ -5,4 +5,11 @@ "development", "hongkong" ] + "tor": { + // KB/s + "bandwidth_rate": 100, + "type": "relay", + "nickname": "hippo" + } + } -- cgit v1.2.3 From 705f42cf9410278eddd2228d5980114b09526c7a Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sat, 9 Nov 2013 20:43:28 +0100 Subject: fix syntax for rhino (dev.) --- nodes/rhino.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nodes') diff --git a/nodes/rhino.json b/nodes/rhino.json index 84ff11f..3fddd25 100644 --- a/nodes/rhino.json +++ b/nodes/rhino.json @@ -4,12 +4,12 @@ "tags": [ "development", "hongkong" - ] + ], "tor": { // KB/s "bandwidth_rate": 100, "type": "relay", - "nickname": "hippo" + "nickname": "rhino" } } -- cgit v1.2.3 From 4784d575de0585816e04659b36a8702b7c54bbac Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 19 Nov 2013 14:48:13 -0500 Subject: remove double quoting from false values --- nodes/snake.json | 2 +- nodes/wombat.json | 2 +- nodes/zebra.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nodes') diff --git a/nodes/snake.json b/nodes/snake.json index 3767c43..f8e715d 100644 --- a/nodes/snake.json +++ b/nodes/snake.json @@ -6,5 +6,5 @@ ], "tags": ["production", "dc"], // currently down in DC, 2013-06-27 - "enabled": "false" + "enabled": false } diff --git a/nodes/wombat.json b/nodes/wombat.json index 9731db4..5479002 100644 --- a/nodes/wombat.json +++ b/nodes/wombat.json @@ -6,5 +6,5 @@ "webapp" ], // currently down in DC, 2013-06-27 - "enabled": "false" + "enabled": false } diff --git a/nodes/zebra.json b/nodes/zebra.json index d6a73ee..eecb5b1 100644 --- a/nodes/zebra.json +++ b/nodes/zebra.json @@ -3,5 +3,5 @@ "services": "mx", "tags": ["production", "dc"], // currently down in DC, 2013-06-27 - "enabled": "false" + "enabled": false } -- cgit v1.2.3 From c73f755a3db36bf9eea411bae91da5e84f158cdc Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 23 Nov 2013 14:58:29 -0800 Subject: add tor to millepede --- nodes/millipede.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nodes') diff --git a/nodes/millipede.json b/nodes/millipede.json index 9534fc7..d96be1a 100644 --- a/nodes/millipede.json +++ b/nodes/millipede.json @@ -3,7 +3,7 @@ "openvpn": { "gateway_address": "198.252.153.84" }, - "services": "openvpn", + "services": ["openvpn", "tor"], "tags": [ "production", "seattle" -- cgit v1.2.3