HCoop
/
hcoop
/
domtool2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
841c836
)
Add caDir and move serialDir into Config.Bind
author
Clinton Ebadi
<clinton@unknownlamer.org>
Thu, 24 Apr 2014 05:39:11 +0000
(
01:39
-0400)
committer
Clinton Ebadi
<clinton@unknownlamer.org>
Thu, 24 Apr 2014 05:39:11 +0000
(
01:39
-0400)
configDefault/bind.cfg
patch
|
blob
|
blame
|
history
configDefault/bind.csg
patch
|
blob
|
blame
|
history
configDefault/domtool.cfg
patch
|
blob
|
blame
|
history
configDefault/domtool.cfs
patch
|
blob
|
blame
|
history
src/plugins/bind.sml
patch
|
blob
|
blame
|
history
diff --git
a/configDefault/bind.cfg
b/configDefault/bind.cfg
index
1554dc3
..
6178bef
100644
(file)
--- a/
configDefault/bind.cfg
+++ b/
configDefault/bind.cfg
@@
-8,6
+8,8
@@
val defaultTTL = 3600
val zonePath = ConfigCore.localRoot ^ "/zones"
val zonePath_real = "/etc/bind/zones"
val zonePath = ConfigCore.localRoot ^ "/zones"
val zonePath_real = "/etc/bind/zones"
+val serialDir = ConfigCore.sharedRoot ^ "/serials"
+
val namedConf = ConfigCore.localRoot ^ "/named.conf.local"
val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish bind"
val namedConf = ConfigCore.localRoot ^ "/named.conf.local"
val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish bind"
diff --git
a/configDefault/bind.csg
b/configDefault/bind.csg
index
3ecd1ca
..
ec2f372
100644
(file)
--- a/
configDefault/bind.csg
+++ b/
configDefault/bind.csg
@@
-8,6
+8,8
@@
signature BIND_CONFIG = sig
val zonePath : string
val zonePath_real : string
val zonePath : string
val zonePath_real : string
+ val serialDir : string
+
val namedConf : string
val reload : string
val namedConf : string
val reload : string
diff --git
a/configDefault/domtool.cfg
b/configDefault/domtool.cfg
index
225b028
..
f580bdb
100644
(file)
--- a/
configDefault/domtool.cfg
+++ b/
configDefault/domtool.cfg
@@
-40,7
+40,7
@@
val trustStore = ConfigCore.sharedRoot ^ "/TrustStore.pem"
val certDir = ConfigCore.sharedRoot ^ "/certs"
val keyDir = ConfigCore.sharedRoot ^ "/keys"
val certDir = ConfigCore.sharedRoot ^ "/certs"
val keyDir = ConfigCore.sharedRoot ^ "/keys"
-val
serialDir = ConfigCore.sharedRoot ^ "/serials
"
+val
caDir = "/etc/domtool/ca
"
val dispatcherName = defaultNode
val dispatcherName = defaultNode
diff --git
a/configDefault/domtool.cfs
b/configDefault/domtool.cfs
index
3424464
..
15b3114
100644
(file)
--- a/
configDefault/domtool.cfs
+++ b/
configDefault/domtool.cfs
@@
-42,7
+42,7
@@
val trustStore : string
val certDir : string
val keyDir : string
val certDir : string
val keyDir : string
-val
serial
Dir : string
+val
ca
Dir : string
val dispatcherName : string
val dispatcherName : string
diff --git
a/src/plugins/bind.sml
b/src/plugins/bind.sml
index
ff99fba
..
4b9eccd
100644
(file)
--- a/
src/plugins/bind.sml
+++ b/
src/plugins/bind.sml
@@
-257,7
+257,7
@@
val () = Slave.registerFileHandler (fn fs =>
val min = readILine inf
val () = TextIO.closeIn inf
val min = readILine inf
val () = TextIO.closeIn inf
- val serialPath = OS.Path.joinDirFile {dir = Config.serialDir,
+ val serialPath = OS.Path.joinDirFile {dir = Config.
Bind.
serialDir,
file = #domain fs}
val oldSerial = let
file = #domain fs}
val oldSerial = let