From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Fri, 9 May 2014 09:50:34 +0000 (-0400)
Subject: Remove mccarthy as node before release
X-Git-Tag: release_20140509
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/7d739612e74b4d6cedce5ad5078b0df51c451789

Remove mccarthy as node before release

It's not actually ready yet, and we have to release now.
---

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index b4ffe14..48d852a 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -15,8 +15,7 @@ val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtoo
 val confDir = ConfigCore.localRoot ^ "/vhosts"
 
 val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG}),
-		      ("mccarthy", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 		    "http://hcoop.net/pipermail"]
diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 77d3a3c..69dcf8a 100644
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -7,14 +7,14 @@ val oldResultRoot = ConfigCore.sharedRoot ^ "/nodes.old"
 
 val domtool_publish = ConfigCore.installPrefix ^ "/sbin/domtool-publish"
 
-val nodeIps = [("deleuze", "69.90.123.67"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("outpost", "151.236.216.192"), ("mccarthy", "69.90.123.73")]
+val nodeIps = [("deleuze", "69.90.123.67"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("outpost", "151.236.216.192")]
 val dispatcherName = "fritz"
 
 val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]
-val mailNodes_admin = ["mccarthy"]
+val mailNodes_admin = []
 
 val aclFile = ConfigCore.sharedRoot ^ "/acl"
 
diff --git a/configDefault/firewall.cfg b/configDefault/firewall.cfg
index 025a0d2..7bd179a 100644
--- a/configDefault/firewall.cfg
+++ b/configDefault/firewall.cfg
@@ -3,7 +3,7 @@ structure Firewall :> FIREWALL_CONFIG = struct
 
 val firewallRules = ConfigCore.sharedRoot ^ "/firewall/user.rules"
 val firewallDir = ConfigCore.localRoot ^ "/firewall/"
-val firewallNodes = ["bog", "navajos", "mccarthy"]
+val firewallNodes = ["bog", "navajos"]
 
 val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewall"