Move domtool-server from deleuze to fritz

[hcoop/domtool2.git] / configDefault / domtool.cfg

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 6a64a83..a56c152 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -19,17 +19,18 @@ val defaultRetry = 1800
 val defaultExpiry = 1209600
 val defaultMinimum = 3600
 
-val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("outpost", "74.115.254.28")]
-val defaultNode = "deleuze"
+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 defaultNode = "fritz"
 
 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"]
-val mailNodes_admin = ["mire"]
+val mailNodes_admin = []
 
 val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
 
@@ -37,7 +38,7 @@ val testUser = "test"
 
 val defaultDomain = "hcoop.net"
 
-val dispatcher = "deleuze.hcoop.net"
+val dispatcher = defaultNode ^ ".hcoop.net"
 val dispatcherPort = 1234
 val slavePort = 1235
 val queueSize = 5
@@ -50,7 +51,7 @@ val certDir = "/afs/hcoop.net/common/etc/domtool/certs"
 val keyDir = "/afs/hcoop.net/common/etc/domtool/keys"
 val serialDir = "/afs/hcoop.net/common/etc/domtool/serials"
 
-val dispatcherName = "deleuze"
+val dispatcherName = defaultNode
 
 fun domtoolDir user =
     case user of
@@ -58,6 +59,6 @@ fun domtoolDir user =
       | _ => OS.Path.joinDirFile {dir = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam user),
                                  file = ".domtool"}
 
-val worldReadable = ["/usr/share/moin", "/usr/share/apache/icons"]
+val worldReadable = ["/usr/share/moin", "/usr/share/apache/icons", "/afs/hcoop.net/common/app/moin/installed"]
 
 val publish_reusers = "/usr/bin/sudo " ^ domtool_publish ^ " users"