Remove fritz from webNodes, remove mire from slave dns

Kill all of the old machines, I say.

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 26a39a3..c97a2ad 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -16,8 +16,7 @@ val confDir = "/var/domtool/vhosts"
 
 val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG}),
     ("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG}),
-    ("fritz", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val webNodes_default = ["mire"]
 

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 0cf6777..05718c4 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -23,10 +23,10 @@ val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68"), ("hopper",
 val defaultNode = "deleuze"
 
 val masterNode = "deleuze"
-val slaveNodes = ["mire", "outpost"]
+val slaveNodes = ["outpost"]
 (* THESE ARE THE DNS MASTER/SLAVE, NOT DOMTOOL NODES *)
 
-val dnsNodes_all = ["deleuze", "mire", "outpost"]
+val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]