From f57bfec1b8c4ae1cc0dcc950ac3a81e19d7e6597 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 12 Mar 2014 20:52:26 +0100 Subject: renamed tag production -> demo --- nodes/aligator.json | 5 +++-- nodes/ant.json | 2 +- nodes/beetle.json | 2 +- nodes/demodex.json | 2 +- nodes/dolphin.json | 2 +- nodes/hippo.json | 2 +- nodes/leech.json | 2 +- nodes/millipede.json | 2 +- nodes/sloth.json | 3 ++- nodes/snake.json | 2 +- nodes/thrips.json | 2 +- nodes/wallaby.json | 2 +- nodes/wombat.json | 2 +- nodes/zebra.json | 2 +- secrets.json | 34 +++++++++++++++++----------------- tags/demo.json | 5 +++++ tags/istanbul.json | 2 +- tags/production.json | 5 ----- 18 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 tags/demo.json delete mode 100644 tags/production.json diff --git a/nodes/aligator.json b/nodes/aligator.json index b5a2e5e..cae6f17 100644 --- a/nodes/aligator.json +++ b/nodes/aligator.json @@ -1,10 +1,11 @@ { "services": "openvpn", "ip_address": "176.53.69.121", - "tags": ["production", "istanbul"], + "tags": ["demo", "istanbul"], "openvpn": { "gateway_address": "176.53.69.123", "allow_free": false, "filter_dns": true - } + }, + "enabled": false } diff --git a/nodes/ant.json b/nodes/ant.json index b5d3373..14c4cbc 100644 --- a/nodes/ant.json +++ b/nodes/ant.json @@ -2,7 +2,7 @@ "ip_address": "198.252.153.82", "services": "couchdb", "tags": [ - "production", + "demo", "seattle" ], "enabled": true diff --git a/nodes/beetle.json b/nodes/beetle.json index 74d4ef0..ebb98ba 100644 --- a/nodes/beetle.json +++ b/nodes/beetle.json @@ -1,6 +1,6 @@ { "ip_address": "202.85.227.195", - "tags": ["production", "hongkong"], + "tags": ["demo", "hongkong"], "services": "openvpn", "openvpn": { "gateway_address": "202.85.227.196" diff --git a/nodes/demodex.json b/nodes/demodex.json index 79b96b1..f3dde74 100644 --- a/nodes/demodex.json +++ b/nodes/demodex.json @@ -1,7 +1,7 @@ { "ip_address": "204.13.164.171", "services": ["backup"], - "tags": ["production", "development", "seattle"], + "tags": ["demo", "development", "seattle"], "ssh": { "port": 22 } diff --git a/nodes/dolphin.json b/nodes/dolphin.json index 3342710..56d803d 100644 --- a/nodes/dolphin.json +++ b/nodes/dolphin.json @@ -4,7 +4,7 @@ { "enabled": false, "ip_address": "223.223.175.10", - "tags": ["production", "phnompenh"], + "tags": ["demo", "phnompenh"], "services": "openvpn", "openvpn": { "gateway_address": "223.223.175.15" diff --git a/nodes/hippo.json b/nodes/hippo.json index 07865f0..0264908 100644 --- a/nodes/hippo.json +++ b/nodes/hippo.json @@ -2,7 +2,7 @@ { "ip_address": "85.17.92.143", "services": ["openvpn", "tor"], - "tags": ["production", "amsterdam"], + "tags": ["demo", "amsterdam"], "openvpn": { "gateway_address": "85.17.92.167" }, diff --git a/nodes/leech.json b/nodes/leech.json index 316257c..a582a5a 100644 --- a/nodes/leech.json +++ b/nodes/leech.json @@ -2,7 +2,7 @@ "ip_address": "198.252.153.85", "services": "mx", "tags": [ - "production", + "demo", "seattle" ] } diff --git a/nodes/millipede.json b/nodes/millipede.json index 609be10..33b3487 100644 --- a/nodes/millipede.json +++ b/nodes/millipede.json @@ -5,7 +5,7 @@ }, "services": ["openvpn"], "tags": [ - "production", + "demo", "seattle" ] } diff --git a/nodes/sloth.json b/nodes/sloth.json index fc9cb88..946280d 100644 --- a/nodes/sloth.json +++ b/nodes/sloth.json @@ -4,5 +4,6 @@ "ssh": { "port": 4422 }, - "tags": ["production", "istanbul"] + "tags": ["demo", "istanbul"], + "enabled": false } diff --git a/nodes/snake.json b/nodes/snake.json index f8e715d..5c52b2e 100644 --- a/nodes/snake.json +++ b/nodes/snake.json @@ -4,7 +4,7 @@ "couchdb", "soledad" ], - "tags": ["production", "dc"], + "tags": ["demo", "dc"], // currently down in DC, 2013-06-27 "enabled": false } diff --git a/nodes/thrips.json b/nodes/thrips.json index 23b7a85..8f0ad56 100644 --- a/nodes/thrips.json +++ b/nodes/thrips.json @@ -4,7 +4,7 @@ "couchdb", "soledad" ], - "tags": ["production", "seattle"], + "tags": ["demo", "seattle"], "couch": { "backup": true } diff --git a/nodes/wallaby.json b/nodes/wallaby.json index 3e69d88..82856a1 100644 --- a/nodes/wallaby.json +++ b/nodes/wallaby.json @@ -1,6 +1,6 @@ { "ip_address": "204.13.164.57", - "tags": ["production", "seattle"], + "tags": ["demo", "seattle"], "services": "webapp", "webapp": { "secure": true diff --git a/nodes/wombat.json b/nodes/wombat.json index a5af6a7..1fbaa78 100644 --- a/nodes/wombat.json +++ b/nodes/wombat.json @@ -1,6 +1,6 @@ { "ip_address": "199.119.112.20", - "tags": ["production", "dc"], + "tags": ["demo", "dc"], "services": [ "webapp" ], diff --git a/nodes/zebra.json b/nodes/zebra.json index eecb5b1..3873f3d 100644 --- a/nodes/zebra.json +++ b/nodes/zebra.json @@ -1,7 +1,7 @@ { "ip_address": "199.119.112.21", "services": "mx", - "tags": ["production", "dc"], + "tags": ["demo", "dc"], // currently down in DC, 2013-06-27 "enabled": false } diff --git a/secrets.json b/secrets.json index 785f757..e97b7e6 100644 --- a/secrets.json +++ b/secrets.json @@ -16,6 +16,23 @@ "nagios_test_password": "HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL", "webapp_secret_token": "MwScfJR7TbrkhSbsYIkMLuac55J48rnt" }, + "default": { + "bigcouch_cookie": "a7xvWkpngHBqI3LRTVad6k7YBG2CYGvD", + "couch_admin_password": "PxjqFKTUCXPV6e7ZqYYBQsE8IqHUMUnX", + "couch_admin_password_salt": "50554138af3fb7fcd89d3b94c5f427a3", + "couch_leap_mx_password": "SIB3VmrTBnUbwRIwsT6xXgJbCLr7nK92", + "couch_leap_mx_password_salt": "6f9685e1047579de69c1281d9a0f7a05", + "couch_nickserver_password": "7hKuTQPETk6uhVZwIBTCEURtQSVHC4cj", + "couch_nickserver_password_salt": "8367dcbb5eef556a974dfe31c1ac1308", + "couch_soledad_password": "xYf3FMH9pzysHZXwUsBmLNr569JkHLFP", + "couch_soledad_password_salt": "ce111d7627d59bccd10546ee9a83287d", + "couch_tapicero_password": "9MGcEvrBwTHSEdS_JFQM4T9gQX6ejWqc", + "couch_tapicero_password_salt": "e4a108ef4d485ca4524eec98e5f5524f", + "couch_webapp_password": "FCuLjxN2DJH85XAWkszRWySzMn_RDbrc", + "couch_webapp_password_salt": "66fabfe0445f3b5b22a24a41eeed11e9", + "nagios_test_password": "yN_djTTBTTFakCf8WDu6EeVaIBqTNfQk", + "webapp_secret_token": "MjNDKaqW3vddC5TuXKRRJW8q2QUAUIa7" + }, "development": { "bigcouch_cookie": "HrwZSWSPLYqySjqWpFYDBD8kzPSZIDf7", "couch_admin_password": "PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH", @@ -51,23 +68,6 @@ "nagios_test_password": "uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT", "webapp_secret_token": "btsFN6UD9nfP4SAWDYMmuMkgRTL5WW7E" }, - "production": { - "bigcouch_cookie": "kSKQMAMHkEd7LZNMBUqePyD2tNMFKLBA", - "couch_admin_password": "npGWSkzVC4UfsVqFAxtHrbmgCmgcCZu9", - "couch_admin_password_salt": "c121f78f5b4c89acc2b6bd5fc3b8336a", - "couch_leap_mx_password": "utA5T2vTchQXkBTA2VQnUy8RNDDbrxfX", - "couch_leap_mx_password_salt": "ba441d5857860d24dc2731985bb1f86d", - "couch_nickserver_password": "dUmTvDfpQfLxVea8aUgP92GvS6KMVa8H", - "couch_nickserver_password_salt": "a850e72653ff988423a538bd64a47679", - "couch_soledad_password": "7aKLhVEmy2Nmh8zMmmb7tQULJFnmKIWB", - "couch_soledad_password_salt": "e2fe4f437d02964da6eef38219cc3e2a", - "couch_tapicero_password": "97IFvcjUUXLLIGRT3vmPG859PRjuzFAc", - "couch_tapicero_password_salt": "701ee5e93bbd6f164e9090e1cfd4da31", - "couch_webapp_password": "e86_NkCguRkTyTTIjQk8R_5F_cc4Uwdk", - "couch_webapp_password_salt": "0b06730ce4b839382170d7731eb090a6", - "nagios_test_password": "LKcmGJKBCErN2fJHADrubHYFgQ_GFkU8", - "webapp_secret_token": "zrLhP4pB6Sjh_YJjxm5kbB9J5BKpzLGj" - }, "unstable": { "bigcouch_cookie": "8Eptmk6hSCaLN6WjWaZGtQbq2IKXnTRe", "couch_admin_password": "LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ", diff --git a/tags/demo.json b/tags/demo.json new file mode 100644 index 0000000..8212653 --- /dev/null +++ b/tags/demo.json @@ -0,0 +1,5 @@ +{ + "ssh": { + "port": 4422 + } +} diff --git a/tags/istanbul.json b/tags/istanbul.json index de48db8..424d2d5 100644 --- a/tags/istanbul.json +++ b/tags/istanbul.json @@ -5,5 +5,5 @@ "timezone": "+2", "hemisphere": "N" }, - "enabled": "= environment != 'production'" + "enabled": "= environment != 'demo'" } diff --git a/tags/production.json b/tags/production.json deleted file mode 100644 index 8212653..0000000 --- a/tags/production.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ssh": { - "port": 4422 - } -} -- cgit v1.2.3