X-Git-Url: https://git.hcoop.net/clinton/domtool2.git/blobdiff_plain/cfedb9220fc5a849df6d5d85cc929d1f72ac0326..7ad80c2038b827f5f47a2768b790967cc9e12b7d:/src/plugins/bind.sml

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index 46bd086..65c2ed8 100644
--- 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
@@ -57,7 +57,7 @@ datatype dns_record =
        | 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 = "*."
@@ -71,6 +71,14 @@ val host = fn (EApp ((EVar "literal", _), e), _) =>
 	      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))
@@ -90,21 +98,21 @@ val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
 		     (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
@@ -162,8 +170,7 @@ fun writeRecord (evs, r) =
 			       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);
@@ -237,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
@@ -250,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
@@ -285,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"}
@@ -322,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)
@@ -341,26 +348,30 @@ 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",
 						     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
 
 end