Remove deleuze from configuration

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index c88f92c..0636c4f 100644 (file)
--- 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 = NO_AUTH})]
+val webNodes_admin = [("mccarthy", {version = APACHE_2, auth = NO_AUTH})]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index c0c287f..be9e772 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -7,13 +7,13 @@ 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"), ("mccarthy", "69.90.123.73"), ("outpost", "151.236.216.192")]
+val nodeIps = [("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("mccarthy", "69.90.123.73"), ("outpost", "151.236.216.192")]
 val dispatcherName = "fritz"
 
-val dnsNodes_all = ["deleuze", "fritz", "outpost"]
+val dnsNodes_all = ["fritz", "outpost"]
 val dnsNodes_admin = []
 
-val mailNodes_all = ["deleuze", "mccarthy"]
+val mailNodes_all = ["mccarthy"]
 val mailNodes_admin = []
 
 val aclFile = ConfigCore.sharedRoot ^ "/acl"

diff --git a/scripts/domtool-reset-global b/scripts/domtool-reset-global
index fd89894..14504ad 100644 (file)
--- a/scripts/domtool-reset-global
+++ b/scripts/domtool-reset-global
@@ -8,7 +8,7 @@ rm -rf ~domtool/webalizer/*
 mkdir ~domtool/webalizer/config
 mkdir ~domtool/webalizer/output
 
-for node in 'deleuze' 'navajos' 'fritz'; do
+for node in 'mccarthy' 'navajos' 'fritz' 'bog' 'outpost'; do
     mkdir ~domtool/webalizer/config/$node
     mkdir ~domtool/webalizer/output/$node
 done