Move default environment settings from SML to Domtool

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

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index 768478f..89e8b06 100644 (file)
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -35,7 +35,7 @@ val dns : Domain.files option ref = ref NONE
 
 val _ = Domain.registerBefore
            (fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node,
-                                                                      name = "dns"})
+                                                                      name = "dns.conf"})
                                       (Domain.dnsMaster ()))
        
 val _ = Domain.registerAfter
@@ -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
@@ -229,7 +229,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                           val {dir, file} = OS.Path.splitDirFile (#file fs)
                                                             
                                           fun dnsChanged () =
-                                              if #domain fs = !didDomain then
+                                              if #domain fs = !didDomain orelse Slave.hostname () <> Config.masterNode then
                                                   ()
                                               else if Slave.isDelete (#action fs) then
                                                   let
@@ -244,7 +244,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                               else
                                                   let
                                                       val inf = TextIO.openIn (OS.Path.joinDirFile {dir = #dir fs,
-                                                                                                    file = "soa"})
+                                                                                                    file = "soa.conf"})
                                                       val kind = readLine inf
                                                       val ttl = readILine inf
                                                       val ns = readLine inf
@@ -292,7 +292,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                                       val _ = TextIO.closeOut outf
 
                                                       val dns = OS.Path.joinDirFile {dir = #dir fs,
-                                                                                     file = "dns"}
+                                                                                     file = "dns.conf"}
 
                                                       val fname = OS.Path.joinBaseExt {base = #domain fs,
                                                                                        ext = SOME "zone"}
@@ -329,8 +329,8 @@ val () = Slave.registerFileHandler (fn fs =>
                                                   end
                                       in
                                           case file of
-                                              "soa" => dnsChanged ()
-                                            | "dns" => dnsChanged ()
+                                              "soa.conf" => dnsChanged ()
+                                            | "dns.conf" => dnsChanged ()
                                             | "named.conf" => namedChanged := true
                                             | _ => ()
                                       end)
@@ -354,7 +354,7 @@ val () = Domain.registerDescriber (Domain.considerAll
                                   [Domain.Filename {filename = "named.conf",
                                                     heading = "named.conf addition:",
                                                     showEmpty = false},
-                                   Domain.Filename {filename = "dns",
+                                   Domain.Filename {filename = "dns.conf",
                                                     heading = "DNS zonefile contents:",
                                                     showEmpty = false}])
 
@@ -374,4 +374,12 @@ val _ = Env.type_one "srv_domain"
        Env.string
        validSrvDomain
 
+val _ = Env.registerFunction ("dns_master_node",
+                             fn [] => SOME (EString Config.masterNode, dl)
+                             | _ => NONE)
+
+val _ = Env.registerFunction ("dns_slave_nodes",
+                             fn [] => SOME (EList (map (fn n => (EString n, dl)) Config.slaveNodes), dl)
+                             | _ => NONE)
+
 end