lib/moin: update for 1.9.9, fix config order

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

diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs
index b464d46..94b0076 100644 (file)
--- a/configDefault/domtool.cfs
+++ b/configDefault/domtool.cfs
@@ -11,22 +11,11 @@ val oldResultRoot : string
 val tmpDir : string
 (* Filesystem location for creating temporary directories *)
 
-(* Paths to standard UNIX utilities *)
-val cat : string
-val cp : string
-val diff : string
-val rm : string
-val echo : string
-val grep : string
-val sudo : string
 val domtool_publish : string
 
 (* Names of machines who will receive configuration *)
 val nodeIps : (string * string) list
-val defaultNode : string
-
-val masterNode : string
-val slaveNodes : string list
+val dispatcherName : string
 
 val aclFile : string
 (* Place to serialize ACL information *)
@@ -35,7 +24,6 @@ val testUser : string
 
 val defaultDomain : string
 
-val dispatcher : string
 val dispatcherPort : int
 val slavePort : int
 val queueSize : int
@@ -46,9 +34,7 @@ val trustStore : string
 
 val certDir : string
 val keyDir : string
-val serialDir : string
-
-val dispatcherName : string
+val caDir : string
 
 val dnsNodes_all : string list
 val dnsNodes_admin : string list
@@ -61,3 +47,5 @@ val domtoolDir : string -> string
 val worldReadable : string list
 
 val publish_reusers : string
+
+include CONFIG_CORE