Add mccarthy as admin web server and mail node

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 48d852a..b4ffe14 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -15,7 +15,8 @@ val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtoo
 val confDir = ConfigCore.localRoot ^ "/vhosts"
 
 val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
 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})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG}),
+                     ("mccarthy", {version = APACHE_2, auth = MOD_WAKLOG})]

 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 69dcf8a..77d3a3c 100644 (file)
--- 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 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")]
+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 dispatcherName = "fritz"
 
 val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]
 val dispatcherName = "fritz"
 
 val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]

-val mailNodes_admin = []
+val mailNodes_admin = ["mccarthy"]

 
 val aclFile = ConfigCore.sharedRoot ^ "/acl"
 
 
 val aclFile = ConfigCore.sharedRoot ^ "/acl"
 

diff --git a/configDefault/firewall.cfg b/configDefault/firewall.cfg
index 7bd179a..025a0d2 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 firewallRules = ConfigCore.sharedRoot ^ "/firewall/user.rules"
 val firewallDir = ConfigCore.localRoot ^ "/firewall/"

-val firewallNodes = ["bog", "navajos"]
+val firewallNodes = ["bog", "navajos", "mccarthy"]

 
 val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewall"
 
 
 val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewall"
 

diff --git a/lib/hcoop.dtl b/lib/hcoop.dtl
index 7f547f2..3f5a6bd 100644 (file)
--- a/lib/hcoop.dtl
+++ b/lib/hcoop.dtl
@@ -18,6 +18,7 @@ val deleuze_ip : (ip) = "69.90.123.67";
 val mire_ip : (ip) = "69.90.123.68";
 val navajos_ip : (ip) = "69.90.123.70";
 val bog_ip : (ip) = "69.90.123.72";
 val mire_ip : (ip) = "69.90.123.68";
 val navajos_ip : (ip) = "69.90.123.70";
 val bog_ip : (ip) = "69.90.123.72";

+val mccarthy_ip : (ip) = "69.90.123.73";

 val hopper_ip : (ip) = "69.90.123.74";
 val fritz_ip : (ip) = "69.90.123.75";
 
 val hopper_ip : (ip) = "69.90.123.74";
 val fritz_ip : (ip) = "69.90.123.75";