HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not generate zone files on bind slaves
[hcoop/domtool2.git]
/
src
/
plugins
/
bind.sml
diff --git
a/src/plugins/bind.sml
b/src/plugins/bind.sml
index
768478f
..
20aeb60
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,
val _ = Domain.registerBefore
(fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node,
- name = "dns"})
+ name = "dns
.conf
"})
(Domain.dnsMaster ()))
val _ = Domain.registerAfter
(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
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
| 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 () =
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
()
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,
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
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,
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"}
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
end
in
case file of
- "soa" => dnsChanged ()
- | "dns" => dnsChanged ()
+ "soa
.conf
" => dnsChanged ()
+ | "dns
.conf
" => dnsChanged ()
| "named.conf" => namedChanged := true
| _ => ()
end)
| "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 = "named.conf",
heading = "named.conf addition:",
showEmpty = false},
- Domain.Filename {filename = "dns",
+ Domain.Filename {filename = "dns
.conf
",
heading = "DNS zonefile contents:",
showEmpty = false}])
heading = "DNS zonefile contents:",
showEmpty = false}])