From 2c4e2cf316247e988b50b148a40d7c2ac7dc482d Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Thu, 24 Apr 2014 01:39:11 -0400 Subject: [PATCH] Add caDir and move serialDir into Config.Bind --- configDefault/bind.cfg | 2 ++ configDefault/bind.csg | 2 ++ configDefault/domtool.cfg | 2 +- configDefault/domtool.cfs | 2 +- src/plugins/bind.sml | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configDefault/bind.cfg b/configDefault/bind.cfg index 1554dc3..6178bef 100644 --- 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 serialDir = ConfigCore.sharedRoot ^ "/serials" + 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 --- a/configDefault/bind.csg +++ b/configDefault/bind.csg @@ -8,6 +8,8 @@ signature BIND_CONFIG = sig val zonePath : string val zonePath_real : string + val serialDir : string + val namedConf : string val reload : string diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg index 225b028..f580bdb 100644 --- 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 serialDir = ConfigCore.sharedRoot ^ "/serials" +val caDir = "/etc/domtool/ca" val dispatcherName = defaultNode diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs index 3424464..15b3114 100644 --- a/configDefault/domtool.cfs +++ b/configDefault/domtool.cfs @@ -42,7 +42,7 @@ val trustStore : string val certDir : string val keyDir : string -val serialDir : string +val caDir : string val dispatcherName : string diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml index ff99fba..4b9eccd 100644 --- 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 serialPath = OS.Path.joinDirFile {dir = Config.serialDir, + val serialPath = OS.Path.joinDirFile {dir = Config.Bind.serialDir, file = #domain fs} val oldSerial = let -- 2.20.1