zoneChanged := false;
didDomain := ""))
-val dns : TextIO.outstream option ref = ref NONE
+val dns : Domain.files option ref = ref NONE
val _ = Domain.registerBefore
- (fn _ => dns := Option.map (fn node => Domain.domainFile {node = node,
- name = "dns"})
+ (fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node,
+ name = "dns.conf"})
(Domain.dnsMaster ()))
val _ = Domain.registerAfter
- (fn _ => (Option.app TextIO.closeOut (!dns);
+ (fn _ => (Option.app (fn files => #close files ()) (!dns);
dns := NONE))
val dl = ErrorMsg.dummyLoc
+datatype host =
+ Literal of string
+ | Wildcard
+ | Default
+
datatype dns_record =
- A of string * string
- | CNAME of string * string
+ A of host * string
+ | CNAME of host * string
| MX of int * string
| NS of string
+ | AAAA of host * string
+ | TXT of host * string
+ | AFSDB of string
+ | SRV of host * int * int * int * string
+
+fun hostS (Literal s) = s ^ "."
+ | hostS Wildcard = "*."
+ | hostS Default = ""
+
+val host = fn (EApp ((EVar "literal", _), e), _) =>
+ Option.map Literal (Env.string e)
+ | (EVar "wildcard", _) =>
+ SOME Wildcard
+ | (EVar "default", _) =>
+ 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 (Env.string e1, Domain.ip e2) of
+ (case (host e1, Domain.ip e2) of
(SOME v1, SOME v2) => SOME (A (v1, v2))
| _ => NONE)
| (EApp ((EApp ((EVar "dnsCNAME", _), e1), _), e2), _) =>
- (case (Env.string e1, Env.string e2) of
+ (case (host e1, Env.string e2) of
(SOME v1, SOME v2) => SOME (CNAME (v1, v2))
| _ => NONE)
| (EApp ((EApp ((EVar "dnsMX", _), e1), _), e2), _) =>
| _ => NONE)
| (EApp ((EVar "dnsNS", _), e), _) =>
Option.map NS (Env.string e)
+ | (EApp ((EApp ((EVar "dnsAAAA", _), e1), _), e2), _) =>
+ (case (host e1, Env.string e2) of
+ (SOME v1, SOME v2) => SOME (AAAA (v1, v2))
+ | _ => NONE)
+ | (EApp ((EApp ((EVar "dnsTXT", _), e1), _), e2), _) =>
+ (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 (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 ignored because no master DNS server is configured for this domain\n"
- | SOME file =>
+ 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 = TextIO.output (file, s)
+ fun write s = #write files s
+ fun writeDom () = #writeDom files ()
val ttl = Env.env Env.int (evs, "TTL")
in
case r of
- A (from, to) => (write from;
- write ".";
- write (Domain.currentDomain ());
+ A (from, to) => (write (hostS from);
+ writeDom ();
write ".\t";
write (Int.toString ttl);
write "\tIN\tA\t";
write to;
write "\n")
- | CNAME (from, to) => (write from;
- write ".";
- write (Domain.currentDomain ());
+ | CNAME (from, to) => (write (hostS from);
+ writeDom ();
write ".\t";
write (Int.toString ttl);
write "\tIN\tCNAME\t";
write to;
write ".\n")
- | MX (num, host) => (write "\t";
+ | MX (num, host) => (writeDom ();
+ write ".\t";
write (Int.toString ttl);
write "\tIN\tMX\t";
write (Int.toString num);
write "\t";
write host;
write ".\n")
- | NS host => (write "\t";
+ | NS host => (writeDom ();
+ write ".\t";
write (Int.toString ttl);
write "\tIN\tNS\t";
write host;
write ".\n")
+ | AAAA (from, to) => (write (hostS from);
+ writeDom ();
+ write ".\t";
+ write (Int.toString ttl);
+ write "\tIN\tAAAA\t";
+ write to;
+ write "\n")
+ | TXT (from, to) => (write (hostS from);
+ writeDom ();
+ write ".\t";
+ write (Int.toString ttl);
+ write "\tIN\tTXT\t\"";
+ write (String.translate (fn #"\"" => "\\\"" | ch => str ch) to);
+ write "\"\n")
+ | AFSDB host => (writeDom ();
+ write ".\t";
+ write (Int.toString ttl);
+ write "\tIN\tAFSDB\t";
+ write "1";
+ write "\t";
+ write host;
+ write ".\n")
+ | SRV (from, priority, weight, port, to) => (write (hostS from);
+ writeDom ();
+ write ".\t";
+ write (Int.toString ttl);
+ write "\tIN\tSRV\t";
+ write (Int.toString priority);
+ write "\t";
+ write (Int.toString weight);
+ write "\t";
+ write (Int.toString port);
+ write "\t";
+ write to;
+ write ".\n")
end
val () = Env.actionV_one "dns"
fun padBy ch amt s =
if size s < amt then
- CharVector.tabulate (amt, fn _ => ch) ^ s
+ CharVector.tabulate (amt - size s, fn _ => ch) ^ s
else
s
val {dir, file} = OS.Path.splitDirFile (#file fs)
fun dnsChanged () =
- if #domain fs = !didDomain then
+ if #domain fs = !didDomain orelse Slave.hostname () <> Config.Bind.masterNode then
()
- else if #action fs = Slave.Delete then
+ else if Slave.isDelete (#action fs) then
let
val fname = OS.Path.joinBaseExt {base = #domain fs,
ext = SOME "zone"}
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 min = readILine inf
val () = TextIO.closeIn inf
+ val serialPath = OS.Path.joinDirFile {dir = Config.Bind.serialDir,
+ file = #domain fs}
+
val oldSerial = let
- val inf = TextIO.openIn (OS.Path.joinDirFile {dir = #dir fs,
- file = "serial"})
+ val inf = TextIO.openIn serialPath
in
SOME (readLine inf)
before TextIO.closeIn inf
- end handle IO.Io _ => NONE
+ end handle IO.Io {name, ...} => NONE
val newSerial =
case serial of
"00")
end
- val outf = TextIO.openOut (OS.Path.joinDirFile {dir = #dir fs,
- file = "serial"})
+ val outf = TextIO.openOut serialPath
val _ = TextIO.output (outf, newSerial)
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)
fn cl => "Error reloading bind with " ^ cl)
else
()))
+
+val () = Domain.registerResetLocal (fn () =>
+ ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/zones/*")))
+
+val () = Domain.registerDescriber (Domain.considerAll
+ [Domain.Filename {filename = "named.conf",
+ heading = "named.conf addition:",
+ showEmpty = false},
+ Domain.Filename {filename = "dns.conf",
+ heading = "DNS zonefile contents:",
+ showEmpty = false}])
+
+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 =
+ size s > 0 andalso size s < 100
+ 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
+
end
HCoop / hcoop / domtool2.git / blobdiff