Merge branch 'dbms-in-slave'

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 61ac39f..e5a5791 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -19,17 +19,17 @@ val defaultRetry = 1800
 val defaultExpiry = 1209600
 val defaultMinimum = 3600
 
-val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68"), ("outpost", "89.16.166.179"), ("hopper", "69.90.123.74")]
+val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75")]
 val defaultNode = "deleuze"
 
 val masterNode = "deleuze"
-val slaveNodes = ["mire", "outpost", "hopper"]
+val slaveNodes = ["mire", "hopper"]
 
-val dnsNodes_all = ["deleuze", "mire", "outpost"]
+val dnsNodes_all = ["deleuze", "mire"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze", "hopper"]
-val mailNodes_admin = ["mire", "outpost"]
+val mailNodes_admin = ["mire"]
 
 val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
 

diff --git a/lib/hcoop.dtl b/lib/hcoop.dtl
index 55c1e2c..49d6aea 100644 (file)
--- a/lib/hcoop.dtl
+++ b/lib/hcoop.dtl
@@ -17,8 +17,8 @@ val mailmanHcoop = mailmanWebHost "lists.hcoop.net";
 val fritz_ip : (ip) = "69.90.123.75";
 val deleuze_ip : (ip) = "69.90.123.67";
 val mire_ip : (ip) = "69.90.123.68";
+val outpost_ip : (ip) = "74.115.254.28";
 val krunk_ip : (ip) = "69.90.123.70";
-val outpost_ip : (ip) = "89.16.166.179";
 val fyodor_ip : (ip) = "64.20.38.170";
 
 val simpleWeb = \host -> \docroot -> web host where