From 9797a02c1ebbb99cb5af4911ee693e171337144a Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 8 Mar 2013 23:05:48 -0800 Subject: removed 'production=x' from environment tags (now we use the field 'environment') --- tags/development.json | 1 - tags/production.json | 1 - 2 files changed, 2 deletions(-) (limited to 'tags') diff --git a/tags/development.json b/tags/development.json index 4dcf5bb..8212653 100644 --- a/tags/development.json +++ b/tags/development.json @@ -1,5 +1,4 @@ { - "production": false, "ssh": { "port": 4422 } diff --git a/tags/production.json b/tags/production.json index 551e323..8212653 100644 --- a/tags/production.json +++ b/tags/production.json @@ -1,5 +1,4 @@ { - "production": true, "ssh": { "port": 4422 } -- 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 --- tags/ankara.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tags/ankara.json (limited to 'tags') diff --git a/tags/ankara.json b/tags/ankara.json new file mode 100644 index 0000000..7152775 --- /dev/null +++ b/tags/ankara.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Ankara", + "country_code": "TR", + "timezone": "+2", + "hemisphere": "N" + } +} \ No newline at end of file -- 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 --- tags/ankara.json | 8 -------- tags/istanbul.json | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 tags/ankara.json create mode 100644 tags/istanbul.json (limited to 'tags') diff --git a/tags/ankara.json b/tags/ankara.json deleted file mode 100644 index 7152775..0000000 --- a/tags/ankara.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "location": { - "name": "Ankara", - "country_code": "TR", - "timezone": "+2", - "hemisphere": "N" - } -} \ No newline at end of file diff --git a/tags/istanbul.json b/tags/istanbul.json new file mode 100644 index 0000000..d5727a2 --- /dev/null +++ b/tags/istanbul.json @@ -0,0 +1,9 @@ +{ + "location": { + "name": "Istanbul", + "country_code": "TR", + "timezone": "+2", + "hemisphere": "N" + }, + "enabled": false +} \ No newline at end of file -- 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 --- tags/dc.json | 11 +++++++++++ tags/seattle.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 tags/dc.json create mode 100644 tags/seattle.json (limited to 'tags') diff --git a/tags/dc.json b/tags/dc.json new file mode 100644 index 0000000..3a1ee5c --- /dev/null +++ b/tags/dc.json @@ -0,0 +1,11 @@ +{ + "location": { + "name": "Washington D.C.", + "country_code": "US", + "timezone":"-5", + "hemisphere": "N" + }, + "ssh": { + "port": 22 + } +} diff --git a/tags/seattle.json b/tags/seattle.json new file mode 100644 index 0000000..efc5784 --- /dev/null +++ b/tags/seattle.json @@ -0,0 +1,11 @@ +{ + "location": { + "name": "Seattle, WA", + "country_code": "US", + "timezone":"-7", + "hemisphere": "N" + }, + "ssh": { + "port": 22 + } +} -- 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' --- tags/clientdev.json | 3 +++ tags/development.json | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tags/clientdev.json (limited to 'tags') diff --git a/tags/clientdev.json b/tags/clientdev.json new file mode 100644 index 0000000..84795e3 --- /dev/null +++ b/tags/clientdev.json @@ -0,0 +1,3 @@ +{ + "environment": "clientdev" +} \ No newline at end of file diff --git a/tags/development.json b/tags/development.json index 8212653..2c63c08 100644 --- a/tags/development.json +++ b/tags/development.json @@ -1,5 +1,2 @@ { - "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 --- tags/clientdev.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tags') diff --git a/tags/clientdev.json b/tags/clientdev.json index 84795e3..ea9817f 100644 --- a/tags/clientdev.json +++ b/tags/clientdev.json @@ -1,3 +1,7 @@ { - "environment": "clientdev" + "environment": "clientdev", + "domain": { + "full_suffix": "= 'cdev.' + global.provider.domain", + "internal_suffix": "= 'cdev.' + global.provider.domain_internal" + } } \ No newline at end of file -- 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. --- tags/hongkong.json | 8 ++++++++ tags/phnompenh.json | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 tags/hongkong.json create mode 100644 tags/phnompenh.json (limited to 'tags') diff --git a/tags/hongkong.json b/tags/hongkong.json new file mode 100644 index 0000000..42eb6d8 --- /dev/null +++ b/tags/hongkong.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Hong Kong", + "country_code": "HK", + "timezone":"+8", + "hemisphere": "N" + } +} diff --git a/tags/phnompenh.json b/tags/phnompenh.json new file mode 100644 index 0000000..f9f243c --- /dev/null +++ b/tags/phnompenh.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Phnom Penh", + "country_code": "KH", + "timezone":"+7", + "hemisphere": "N" + } +} -- cgit v1.2.3 From 28b63c6c59ca0d5729c019e3a1970644cdb8f7ff Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 14 Jun 2013 18:39:08 +0200 Subject: enable development servers in istanbul again --- tags/istanbul.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tags') diff --git a/tags/istanbul.json b/tags/istanbul.json index d5727a2..de48db8 100644 --- a/tags/istanbul.json +++ b/tags/istanbul.json @@ -5,5 +5,5 @@ "timezone": "+2", "hemisphere": "N" }, - "enabled": false -} \ No newline at end of file + "enabled": "= environment != 'production'" +} -- 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 --- tags/amsterdam.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tags/amsterdam.json (limited to 'tags') diff --git a/tags/amsterdam.json b/tags/amsterdam.json new file mode 100644 index 0000000..3c7b675 --- /dev/null +++ b/tags/amsterdam.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Amsterdam", + "country_code": "NL", + "timezone":"+1", + "hemisphere": "N" + } +} -- cgit v1.2.3 From 3e92c6b2c5c8ae649f9039ee1ada8a73c30a1568 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 14 Aug 2013 16:01:26 +0200 Subject: use squid-deb-proxy-client on local vagrant machines to speed up testing --- tags/local.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tags/local.json (limited to 'tags') diff --git a/tags/local.json b/tags/local.json new file mode 100644 index 0000000..c604987 --- /dev/null +++ b/tags/local.json @@ -0,0 +1,3 @@ +{ + "squid_deb_proxy_client": true +} -- cgit v1.2.3 From ae51b1edab845a8af34737dae560b8ef1f9b23c9 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 14 Aug 2013 17:50:17 +0200 Subject: seattle: use port 4422 for ssh on all nodes --- tags/seattle.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'tags') diff --git a/tags/seattle.json b/tags/seattle.json index efc5784..b992419 100644 --- a/tags/seattle.json +++ b/tags/seattle.json @@ -4,8 +4,5 @@ "country_code": "US", "timezone":"-7", "hemisphere": "N" - }, - "ssh": { - "port": 22 } } -- cgit v1.2.3