Remove fritz from webNodes, remove mire from slave dns

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

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 730414f..05718c4 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -1,6 +1,7 @@
 val libRoot = "/afs/hcoop.net/common/etc/domtool/lib"
 val resultRoot = "/afs/hcoop.net/common/etc/domtool/nodes"
 val tmpDir = "/tmp/domtool"
+val oldResultRoot = "/afs/hcoop.net/common/etc/domtool/nodes.old"
 
 val cat = "/bin/cat"
 val cp = "/bin/cp"
@@ -11,20 +12,21 @@ val grep = "/bin/grep"
 val sudo = "/usr/bin/sudo"
 val domtool_publish = "/usr/local/sbin/domtool-publish"
 
-val defaultNs = "ns.hcoop.net"
+val defaultNs = "ns1.hcoop.net"
 
-val defaultRefresh = 172800
-val defaultRetry = 900
+val defaultRefresh = 86400
+val defaultRetry = 1800
 val defaultExpiry = 1209600
 val defaultMinimum = 3600
 
-val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68")]
+val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68"), ("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 = "deleuze"
 
 val masterNode = "deleuze"
-val slaveNodes = ["mire"]
+val slaveNodes = ["outpost"]
+(* THESE ARE THE DNS MASTER/SLAVE, NOT DOMTOOL NODES *)
 
-val dnsNodes_all = ["deleuze", "mire"]
+val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]
@@ -44,18 +46,19 @@ val queueSize = 5
 val bufSize = 1024
 
 val trustStore = "/afs/hcoop.net/common/etc/domtool/TrustStore.pem"
-val serverCert = "/afs/hcoop.net/common/etc/domtool/servercert.pem"
-val serverKey = "/etc/domtool/serverkey.pem"
 
 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.hcoop.net"
-
-val homeBase = "/afs/hcoop.net/usr"
+val dispatcherName = "deleuze"
 
 fun domtoolDir user =
     case user of
-       "domtool" => "/afs/hcoop.net/common/etc/domtool/domtool"
-      | _ => "/afs/hcoop.net/usr/" ^ user ^ "/domtool"
+       "domtool" => "/afs/hcoop.net/common/etc/domtool/.domtool"
+      | _ => OS.Path.joinDirFile {dir = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam user),
+                                 file = ".domtool"}
+
+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"