X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/1638d5a206cd79e9619f0d3334fed29eaddc6b51..c23af4454e79f11677c808b3e05e9d14061f71b1:/configDefault/domtool.cfs

diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs
index cb638c7..aea7f33 100644
--- a/configDefault/domtool.cfs
+++ b/configDefault/domtool.cfs
@@ -11,29 +11,12 @@ 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
 
-(* DNS SOA parameter defaults *)
-val defaultNs : string
-val defaultRefresh : int
-val defaultRetry : int
-val defaultExpiry : int
-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
+(* This should be a record type instead of a list *)
+val nodeIps : (string * string * string) list
+val dispatcherName : string
 
 val aclFile : string
 (* Place to serialize ACL information *)
@@ -42,7 +25,6 @@ val testUser : string
 
 val defaultDomain : string
 
-val dispatcher : string
 val dispatcherPort : int
 val slavePort : int
 val queueSize : int
@@ -50,14 +32,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 caDir : string
 
 val dnsNodes_all : string list
 val dnsNodes_admin : string list
@@ -68,3 +46,7 @@ val mailNodes_admin : string list
 val domtoolDir : string -> string
 
 val worldReadable : string list
+
+val publish_reusers : string
+
+include CONFIG_CORE