HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mysql: revoke permissions when dropping database
[hcoop/domtool2.git]
/
configDefault
/
domtool.cfs
diff --git
a/configDefault/domtool.cfs
b/configDefault/domtool.cfs
index
6d8622a
..
aea7f33
100644
(file)
--- a/
configDefault/domtool.cfs
+++ b/
configDefault/domtool.cfs
@@
-13,16
+13,10
@@
val tmpDir : string
val domtool_publish : 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 *)
(* Names of machines who will receive configuration *)
-val nodeIps : (string * string) list
-val defaultNode : string
+(* 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 *)
val aclFile : string
(* Place to serialize ACL information *)
@@
-31,7
+25,6
@@
val testUser : string
val defaultDomain : string
val defaultDomain : string
-val dispatcher : string
val dispatcherPort : int
val slavePort : int
val queueSize : int
val dispatcherPort : int
val slavePort : int
val queueSize : int
@@
-42,9
+35,7
@@
val trustStore : string
val certDir : string
val keyDir : 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
val dnsNodes_all : string list
val dnsNodes_admin : string list
@@
-57,3
+48,5
@@
val domtoolDir : string -> string
val worldReadable : string list
val publish_reusers : string
val worldReadable : string list
val publish_reusers : string
+
+include CONFIG_CORE