Move more bind config into domtool, remove hardcoded /var/domtool references

[hcoop/domtool2.git] / src / plugins / bind.sml

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index 10892a2..65c2ed8 100644 (file)
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -111,8 +111,8 @@ val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
 
 fun writeRecord (evs, r) =
     case !dns of
-       NONE => print ("Warning: DNS directive for " ^ Domain.currentDomain ()
-                      ^ " ignored because no master DNS server is configured for this domain\n")
+       NONE => () (* print ("Warning: DNS directive for " ^ Domain.currentDomain ()
+                      ^ " ignored because no master DNS server is configured for this domain\n") *)
       | SOME files =>
        let
            fun write s = #write files s
@@ -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
@@ -348,7 +348,7 @@ val () = Slave.registerPostHandler
                      ()))
 
 val () = Domain.registerResetLocal (fn () =>
-                                      ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/zones/*")))
+                                      ignore (OS.Process.system (Config.rm ^ " -rf " ^ Config.Bind.zonePath ^ "/*")))
 
 val () = Domain.registerDescriber (Domain.considerAll
                                   [Domain.Filename {filename = "named.conf",