Remove Config.{dispatcher,defaultNode}

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

diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs
index ed66232..4cf7fee 100644 (file)
--- a/configDefault/domtool.cfs
+++ b/configDefault/domtool.cfs
@@ -5,17 +5,12 @@ val resultRoot : string
 (* Root directory for a directory hierarchy corresponding to domain structure,
  * where each node contains Domtool-generated result files for that domain. *)
 
+val oldResultRoot : string
+(* Save an old copy for differencing *)
+
 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
 
 (* DNS SOA parameter defaults *)
@@ -27,10 +22,7 @@ val defaultMinimum : int
 
 (* 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 *)
@@ -39,7 +31,6 @@ val testUser : string
 
 val defaultDomain : string
 
-val dispatcher : string
 val dispatcherPort : int
 val slavePort : int
 val queueSize : int
@@ -47,16 +38,10 @@ val queueSize : int
 val bufSize : int
 
 val trustStore : string
-val serverCert : string
-val serverKey : string
 
 val certDir : string
 val keyDir : string
-val serialDir : string
-
-val dispatcherName : string
-
-val homeBase : string
+val caDir : string
 
 val dnsNodes_all : string list
 val dnsNodes_admin : string list
@@ -65,3 +50,9 @@ val mailNodes_all : string list
 val mailNodes_admin : string list
 
 val domtoolDir : string -> string
+
+val worldReadable : string list
+
+val publish_reusers : string
+
+include CONFIG_CORE