val _ = Domain.registerBefore
(fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node,
- name = "dns"})
+ name = "dns.conf"})
(Domain.dnsMaster ()))
val _ = Domain.registerAfter
| AAAA of host * string
| TXT of host * string
| AFSDB of string
- | SRV of string * int * int * int * string
+ | SRV of host * int * int * int * string
fun hostS (Literal s) = s ^ "."
| hostS Wildcard = "*."
SOME Default
| _ => NONE
+val srv_host = fn (EApp ((EVar "srv_literal", _), e), _) =>
+ Option.map Literal (Env.string e)
+ | (EVar "srv_wildcard", _) =>
+ SOME Wildcard
+ | (EVar "srv_default", _) =>
+ SOME Default
+ | _ => NONE
+
val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
(case (host e1, Domain.ip e2) of
(SOME v1, SOME v2) => SOME (A (v1, v2))
(SOME v1, SOME v2) => SOME (AAAA (v1, v2))
| _ => NONE)
| (EApp ((EApp ((EVar "dnsTXT", _), e1), _), e2), _) =>
- (case (host e1, Env.string e2) of
+ (case (srv_host e1, Env.string e2) of
(SOME v1, SOME v2) => SOME (TXT (v1, v2))
| _ => NONE)
| (EApp ((EVar "dnsAFSDB", _), e), _) =>
Option.map AFSDB (Env.string e)
| (EApp ((EApp ((EApp ((EApp ((EApp ((EVar "dnsSRV", _), e1), _), e2), _), e3), _), e4), _), e5), _) =>
- (case (Env.string e1, Env.int e2, Env.int e3, Env.int e4, Env.string e5) of
+ (case (srv_host e1, Env.int e2, Env.int e3, Env.int e4, Env.string e5) of
(SOME v1, SOME v2, SOME v3, SOME v4, SOME v5) => SOME (SRV (v1, v2, v3, v4, v5))
| _ => NONE)
| _ => NONE
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
write "\t";
write host;
write ".\n")
- | SRV (from, priority, weight, port, to) => (write from;
- write ".";
+ | SRV (from, priority, weight, port, to) => (write (hostS from);
writeDom ();
write ".\t";
write (Int.toString ttl);
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
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 _ = 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"}
end
in
case file of
- "soa" => dnsChanged ()
- | "dns" => dnsChanged ()
+ "soa.conf" => dnsChanged ()
+ | "dns.conf" => dnsChanged ()
| "named.conf" => namedChanged := true
| _ => ()
end)
[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}])
-fun validHost_ s =
+fun validSrvHost s =
size s > 0 andalso size s < 20
andalso CharVector.all (fn ch => Domain.isIdent ch orelse ch = #"-" orelse ch = #"_") s
-fun validSRVDomain s =
+fun validSrvDomain s =
size s > 0 andalso size s < 100
- andalso List.all validHost_ (String.fields (fn ch => ch = #".") s)
+ andalso List.all validSrvHost (String.fields (fn ch => ch = #".") s)
+
+val _ = Env.type_one "srv_host"
+ Env.string
+ validSrvHost
val _ = Env.type_one "srv_domain"
Env.string
- validSRVDomain
+ 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