Better error message for fwtool

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

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 6d1c7e1..986ab12 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -1,27 +1,32 @@
 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"
 val diff = "/usr/bin/diff"
 val rm = "/bin/rm"
 val echo = "/bin/echo"
+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"), ("outpost", "74.115.254.28"), ("navajos", "69.90.123.70")]
 val defaultNode = "deleuze"
 
 val masterNode = "deleuze"
-val slaveNodes = ["mire"]
+val slaveNodes = ["mire", "outpost"]
+(* THESE ARE THE DNS MASTER/SLAVE, NOT DOMTOOL NODES *)
 
-val dnsNodes_all = ["deleuze", "mire"]
+val dnsNodes_all = ["deleuze", "mire", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]
@@ -41,13 +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 dispatcherName = "deleuze"
 
-val homeBase = "/afs/hcoop.net/usr"
+fun domtoolDir user =
+    case user of
+       "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"]
+
+val publish_reusers = "/usr/bin/sudo " ^ domtool_publish ^ " users"