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

diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs
index a3267d5..aea7f33 100644
--- a/configDefault/domtool.cfs
+++ b/configDefault/domtool.cfs
@@ -5,29 +5,18 @@ 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
-
-(* DNS SOA parameter defaults *)
-val defaultNs : string
-val defaultRefresh : int
-val defaultRetry : int
-val defaultExpiry : int
-val defaultMinimum : int
+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
+(* 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 *)
@@ -36,7 +25,6 @@ val testUser : string
 
 val defaultDomain : string
 
-val dispatcher : string
 val dispatcherPort : int
 val slavePort : int
 val queueSize : int
@@ -44,16 +32,21 @@ 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
+
+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