hcoop: remove fritz and bog from domtool control

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index e55ca99..4cf1168 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -20,7 +20,7 @@ val webNodes_admin = [("minsky", {version = APACHE_2, auth = MOD_WAKLOG})]
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
-val proxyHosts = ["bog", "marsh"]
+val proxyHosts = ["marsh"]
 
 val public_html = "public_html"
 

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 88c22cd..b57b6e2 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -7,10 +7,10 @@ val oldResultRoot = ConfigCore.sharedRoot ^ "/nodes.old"
 
 val domtool_publish = ConfigCore.installPrefix ^ "/sbin/domtool-publish"
 
-val nodeIps = [("fritz", "69.90.123.75"), ("bog", "69.90.123.72"), ("outpost", "151.236.216.192"), ("gibran", "142.93.177.82"), ("marsh", "45.55.52.66"), ("minsky", "104.248.1.95"), ("shelob", "68.183.54.165"), ("lovelace", "68.183.58.241")]
+val nodeIps = [("outpost", "151.236.216.192"), ("gibran", "142.93.177.82"), ("marsh", "45.55.52.66"), ("minsky", "104.248.1.95"), ("shelob", "68.183.54.165"), ("lovelace", "68.183.58.241")]
 val dispatcherName = "gibran"
 
-val dnsNodes_all = ["fritz", "outpost", "gibran"]
+val dnsNodes_all = ["outpost", "gibran"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["minsky"]

diff --git a/configDefault/firewall.cfg b/configDefault/firewall.cfg
index 1976d28..15a4e69 100644 (file)
--- 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", "marsh", "shelob"]
+val firewallNodes = ["marsh", "shelob"]
 
 val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewallpuppet"
 val dig = "/usr/bin/dig"