Add caDir and move serialDir into Config.Bind

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

diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs
index a1c755a..15b3114 100644 (file)
--- a/configDefault/domtool.cfs
+++ b/configDefault/domtool.cfs
@@ -11,14 +11,6 @@ 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 *)
@@ -32,9 +24,6 @@ val defaultMinimum : int
 val nodeIps : (string * string) list
 val defaultNode : string
 
-val masterNode : string
-val slaveNodes : string list
-
 val aclFile : string
 (* Place to serialize ACL information *)
 
@@ -53,7 +42,7 @@ val trustStore : string
 
 val certDir : string
 val keyDir : string
-val serialDir : string
+val caDir : string
 
 val dispatcherName : string
 
@@ -68,3 +57,5 @@ val domtoolDir : string -> string
 val worldReadable : string list
 
 val publish_reusers : string
+
+include CONFIG_CORE