Remove Config.{dispatcher,defaultNode}

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

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index a56c152..eeaebad 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -1,16 +1,11 @@
-val libRoot = "/afs/hcoop.net/common/etc/domtool/lib"
-val resultRoot = "/afs/hcoop.net/common/etc/domtool/nodes"
+open ConfigCore
+
+val libRoot = ConfigCore.sharedRoot ^ "/lib"
+val resultRoot = ConfigCore.sharedRoot ^ "/nodes"
 val tmpDir = "/tmp/domtool"
-val oldResultRoot = "/afs/hcoop.net/common/etc/domtool/nodes.old"
+val oldResultRoot = ConfigCore.sharedRoot ^ "/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 domtool_publish = ConfigCore.installPrefix ^ "/sbin/domtool-publish"
 
 val defaultNs = "ns1.hcoop.net"
 
@@ -20,11 +15,7 @@ val defaultExpiry = 1209600
 val defaultMinimum = 3600
 
 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 = ["outpost"]
-(* THESE ARE THE DNS MASTER/SLAVE, NOT DOMTOOL NODES *)
+val dispatcherName = "fritz"
 
 val dnsNodes_all = ["deleuze", "outpost"]
 val dnsNodes_admin = []
@@ -32,33 +23,30 @@ val dnsNodes_admin = []
 val mailNodes_all = ["deleuze"]
 val mailNodes_admin = []
 
-val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
+val aclFile = ConfigCore.sharedRoot ^ "/acl"
 
 val testUser = "test"
 
 val defaultDomain = "hcoop.net"
 
-val dispatcher = defaultNode ^ ".hcoop.net"
 val dispatcherPort = 1234
 val slavePort = 1235
 val queueSize = 5
 
 val bufSize = 1024
 
-val trustStore = "/afs/hcoop.net/common/etc/domtool/TrustStore.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 trustStore = ConfigCore.sharedRoot ^ "/TrustStore.pem"
 
-val dispatcherName = defaultNode
+val certDir = ConfigCore.sharedRoot ^ "/certs"
+val keyDir = ConfigCore.sharedRoot ^ "/keys"
+val caDir = "/etc/domtool/ca"
 
 fun domtoolDir user =
     case user of
-       "domtool" => "/afs/hcoop.net/common/etc/domtool/.domtool"
+       "domtool" => ConfigCore.sharedRoot ^ "/.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"
+val publish_reusers = ConfigCore.sudo ^ " " ^ domtool_publish ^ " users"