Remove references to mire from source code

* Nuke it from orbit!
* Also: why are we destroying all webalizer output in domtool-reset-global?!

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 87d50fd..ccb222d 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -14,8 +14,7 @@ val fixperms1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-fixperm
 
 val confDir = "/var/domtool/vhosts"
 
-val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG}),
-    ("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
 val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val webNodes_default = ["navajos"]
@@ -23,9 +22,7 @@ val webNodes_default = ["navajos"]
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
-val proxyHosts = ["localhost", (* deprecated! *)
-                 "mire",
-                 "bog"]
+val proxyHosts = ["bog"]
 
 val public_html = "public_html"
 

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 05718c4..dbc06f1 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -19,7 +19,7 @@ val defaultRetry = 1800
 val defaultExpiry = 1209600
 val defaultMinimum = 3600
 
-val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68"), ("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 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 defaultNode = "deleuze"
 
 val masterNode = "deleuze"
@@ -30,7 +30,7 @@ val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]
-val mailNodes_admin = ["mire"]
+val mailNodes_admin = []
 
 val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
 

diff --git a/scripts/domtool-reset-global b/scripts/domtool-reset-global
index fccd155..fd89894 100644 (file)
--- a/scripts/domtool-reset-global
+++ b/scripts/domtool-reset-global
@@ -2,12 +2,13 @@
 
 rm -rf ~domtool/nodes/*
 rm -rf ~domtool/serials/*
+# do we really need to purge all webalizer output?
 rm -rf ~domtool/webalizer/*
 
 mkdir ~domtool/webalizer/config
 mkdir ~domtool/webalizer/output
 
-for node in 'mire' 'deleuze' 'navajos' 'fritz'; do
+for node in 'deleuze' 'navajos' 'fritz'; do
     mkdir ~domtool/webalizer/config/$node
     mkdir ~domtool/webalizer/output/$node
 done