diff options
| author | elijah <elijah@riseup.net> | 2016-01-19 10:40:28 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-01-19 10:40:28 -0800 |
| commit | 221c4886f34a4b6c61cc6e1044bf297827dbe7d2 (patch) | |
| tree | 4886ea923571d53eb6f063aeb507b4a8c1f5fc34 /nodes | |
| parent | 43c47fd5d271e98a68fa9e7035fe120b8c848d25 (diff) | |
| parent | 119bb775c9083864dc74a8a253fc955bbd0446a5 (diff) | |
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'nodes')
| -rw-r--r-- | nodes/aardwolf.json | 2 | ||||
| -rw-r--r-- | nodes/armadillo.json | 11 | ||||
| -rw-r--r-- | nodes/cat.json | 2 | ||||
| -rw-r--r-- | nodes/donkey.json | 7 | ||||
| -rw-r--r-- | nodes/gorilla.json | 11 | ||||
| -rw-r--r-- | nodes/quetzal.json | 17 | ||||
| -rw-r--r-- | nodes/tuatara.json | 2 |
7 files changed, 9 insertions, 43 deletions
diff --git a/nodes/aardwolf.json b/nodes/aardwolf.json index 9bd392d..81ebe58 100644 --- a/nodes/aardwolf.json +++ b/nodes/aardwolf.json @@ -1,5 +1,5 @@ { - "ip_address": "199.119.112.124", + "ip_address": "199.119.112.205", "services": [ "couchdb", "soledad" diff --git a/nodes/armadillo.json b/nodes/armadillo.json deleted file mode 100644 index ddb7e37..0000000 --- a/nodes/armadillo.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ip_address": "1.209.122.24", - "services": "couchdb", - "couch": { - "version": "2.0" - }, - "tags": [ - "bleeding", "seoul" - ], - "enabled": true -} diff --git a/nodes/cat.json b/nodes/cat.json index 5a9b055..c74847d 100644 --- a/nodes/cat.json +++ b/nodes/cat.json @@ -1,5 +1,5 @@ { - "ip_address": "199.119.112.123", + "ip_address": "199.119.112.206", "services": "mx", "tags": ["unstable", "dc"], "sources": { diff --git a/nodes/donkey.json b/nodes/donkey.json index 6870d48..0600a80 100644 --- a/nodes/donkey.json +++ b/nodes/donkey.json @@ -1,5 +1,5 @@ { - "ip_address": "199.119.112.133", + "ip_address": "199.119.112.207", "services": [ "monitor", "webapp", @@ -15,6 +15,11 @@ "apt": { "basic": "http://deb.leap.se/experimental-0.8" } + }, + "webapp": { + "type": "git", + "source": "https://leap.se/git/leap_web", + "revision": "origin/develop" } } } diff --git a/nodes/gorilla.json b/nodes/gorilla.json deleted file mode 100644 index 218a9f3..0000000 --- a/nodes/gorilla.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ip_address": "1.209.122.26", - "services": "couchdb", - "couch": { - "version": "2.0" - }, - "tags": [ - "bleeding", "seoul" - ], - "enabled": true -} diff --git a/nodes/quetzal.json b/nodes/quetzal.json deleted file mode 100644 index b1423e2..0000000 --- a/nodes/quetzal.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ip_address": "199.119.112.197", - "environment": "jessie", - "tags": ["jessie", "dc"], - "services": ["webapp", "couchdb", "mx", "soledad", "pixelated"], - "sources": { - "platform": { - "apt": { - "basic": "http://deb.leap.se/experimental-0.8" - } - } - }, - "couch": { - "master": true, - "pwhash_alg": "pbkdf2" - } -} diff --git a/nodes/tuatara.json b/nodes/tuatara.json index b861ff6..42677bb 100644 --- a/nodes/tuatara.json +++ b/nodes/tuatara.json @@ -1,5 +1,5 @@ { - "ip_address": "199.119.112.147", + "ip_address": "199.119.112.208", "openvpn": { "gateway_address": "199.119.112.148" }, |