hcoop: rename quag -> marsh

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 6613fb1..cf01c54 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -7,7 +7,7 @@ val oldResultRoot = ConfigCore.sharedRoot ^ "/nodes.old"
 
 val domtool_publish = ConfigCore.installPrefix ^ "/sbin/domtool-publish"
 
-val nodeIps = [("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"), ("gibran", "159.203.101.102"), ("quag", "45.55.56.11")]
+val nodeIps = [("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"), ("gibran", "159.203.101.102"), ("marsh", "165.227.79.103")]
 val dispatcherName = "fritz"
 
 val dnsNodes_all = ["fritz", "outpost"]

diff --git a/configDefault/firewall.cfg b/configDefault/firewall.cfg
index 6ed751b..5d8a513 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", "navajos", "quag"]
+val firewallNodes = ["bog", "navajos", "marsh"]
 
 val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewallpuppet"
 val dig = "/usr/bin/dig"

diff --git a/lib/hcoop.dtl b/lib/hcoop.dtl
index e36f867..d05594d 100644 (file)
--- a/lib/hcoop.dtl
+++ b/lib/hcoop.dtl
@@ -31,9 +31,9 @@ val gibran_ip : (ip) = "159.203.101.102";
 val gibran_private_ip : (ip) = "10.132.94.132";
 val gibran_ipv6 : (ipv6) = "2604:a880:800:a1::c6:f001";
 
-val quag_ip : (ip) ="45.55.56.11";
-val quag_private_ip : (ip) = "10.132.134.46";
-val quag_ipv6 : (ipv6) = "2604:a880:800:a1::67a:3001";
+val marsh_ip : (ip) = "165.227.79.103";
+val marsh_private_ip : (ip) = "10.132.53.183";
+val marsh_ipv6 : (ipv6) = "2604:a880:800:a1::8dc:4001";
 
 (* val fyodor_ip : (ip) = "64.20.38.170"; *)