summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-12-06 15:57:03 -0800
committerelijah <elijah@riseup.net>2013-12-06 15:57:03 -0800
commitce815e962ed9d1abc1fc6a0d625fff6212472f2c (patch)
tree7d4221a189622f459e810c1f60b3fa4204e747eb
parent5b7eb8b466b247914df18b58ddbf12b0f3e3f017 (diff)
tmp changes for current deploy: disable dolphin, use leap_web:develop
-rw-r--r--files/ssh/known_hosts1
-rw-r--r--nodes/dolphin.json1
-rw-r--r--services/webapp.json2
3 files changed, 2 insertions, 2 deletions
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 025f19a..8d83200 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -8,7 +8,6 @@ canvasback,canvasback.cdev.bitmask.i,canvasback.cdev.bitmask.net,199.119.112.4 e
chipmonk,chipmonk.cdev.bitmask.i,chipmonk.cdev.bitmask.net,199.119.112.19 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEL2oI+gVZHnfgnB3erDt7EWR+bCV06JD3uUEBodivsGGjSwxUArn1G1o2+oiY2SGL/5TonPugjq9VMWSOtQSfk=
clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs=
demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMux0p9GOVwCFj7T2Kh0whLPz3c8v8mL/6i6+GejvPcM89+I/ahVzDFExxMzlmFwz+yZ95ygROXRkzKYUSpMdGM=
-dolphin,dolphin.bitmask.i,dolphin.bitmask.net,223.223.175.10 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJJko1TdhJ4a9BD42zEHS1R3ASkocUkjRuXRNtNdsGMFNB4vwrvR8Rdb2d52iwHyGeSgPmFN592YJv3C/rfIegk=
elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2ch5SOj72gGA8kqYoDU8Rvu0CgoErondm7nZvGF+gnj4P0YdKGStnYIPCPyTEA1maRaf3XAkdXbZB/QbN8VkYxJ5N/pqpq0cLPBq/No1FNkXSB/G7QhcILWPuARsXXc5gNV3Fm2QGNTLi7Ji7Y5DpezF9fN3Xao2kb743qI4r4uD0fuwkNccSYsGVZyCkkCzcqoS4vr/zTnTILp+iwq9sP/eaQ9rcICSXmgRleU9vw4E83e5L0llqf1vMGpL/TbX7rNq6T2zOHVcwHkNQwaVa6rSSExYthhEF5St20863DEJSHFa7UzoXdrT9w97WdHQ+p2yMzV3nvOTuhWUP4HCx
elk,elk.dev.bitmask.i,elk.dev.bitmask.net,204.13.164.252 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIyVKu0Y607ua/WSo/ZWkrVEF/kBGkbLFSYn2mhxdQtJHe8pxYRghi7NsUjpRSUCIUuK9AnwWGXe2mMUZ45o0Tg=
gadwall,gadwall.cdev.bitmask.i,gadwall.cdev.bitmask.net,199.119.112.5 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHXXEDMxnB6pDpO7FENdl54kf1FOzVuDfQnNmu4I9Jj6BzwUXSrRL4hQxyP5YHFtUEiAx/OKBUea9/4a0jgz/Cs=
diff --git a/nodes/dolphin.json b/nodes/dolphin.json
index 802d3f0..3342710 100644
--- a/nodes/dolphin.json
+++ b/nodes/dolphin.json
@@ -2,6 +2,7 @@
// also has IP: 223.223.175.11
//
{
+ "enabled": false,
"ip_address": "223.223.175.10",
"tags": ["production", "phnompenh"],
"services": "openvpn",
diff --git a/services/webapp.json b/services/webapp.json
index dbb55a0..c21cfff 100644
--- a/services/webapp.json
+++ b/services/webapp.json
@@ -3,7 +3,7 @@
"admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "etest1", "meanderingcode"],
"git": {
"source": "https://leap.se/git/leap_web",
- "revision": "origin/master"
+ "revision": "origin/develop"
}
}
}