X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/325285ab74fb24bf441fa8137556accc3a518905..77a8fca278b561808959fa1aa7d9f02c5cfe7720:/src/plugins/bind.sml

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index faa8e4e..9c72152 100644
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -51,7 +51,7 @@ datatype dns_record =
        | NS of string
 
 val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
-		(case (Env.string e1, Env.string e2) of
+		(case (Env.string e1, Domain.ip e2) of
 		     (SOME v1, SOME v2) => SOME (A (v1, v2))
 		   | _ => NONE)
 	      | (EApp ((EApp ((EVar "dnsCNAME", _), e1), _), e2), _) =>
@@ -116,6 +116,34 @@ fun readLine inf =
 
 fun readILine inf = valOf (Int.fromString (readLine inf))
 
+val monthToInt = fn Date.Jan => 1
+		  | Date.Feb => 2
+		  | Date.Mar => 3
+		  | Date.Apr => 4
+		  | Date.May => 5
+		  | Date.Jun => 6
+		  | Date.Jul => 7
+		  | Date.Aug => 8
+		  | Date.Sep => 9
+		  | Date.Oct => 10
+		  | Date.Nov => 11
+		  | Date.Dec => 12
+
+fun padBy ch amt s =
+    if size s < amt then
+	CharVector.tabulate (amt - size s, fn _ => ch) ^ s
+    else
+	s
+
+fun dateString () =
+    let
+	val date = Date.fromTimeUniv (Time.now ())
+    in
+	padBy #"0" 4 (Int.toString (Date.year date))
+	^ padBy #"0" 2 (Int.toString (monthToInt (Date.month date)))
+	^ padBy #"0" 2 (Int.toString (Date.day date))
+    end
+
 val () = Slave.registerFileHandler (fn fs =>
 				       let
 					   val {dir, file} = OS.Path.splitDirFile (#file fs)
@@ -149,6 +177,40 @@ val () = Slave.registerFileHandler (fn fs =>
 						       val min = readILine inf
 						       val () = TextIO.closeIn inf
 
+						       val serialPath = OS.Path.joinDirFile {dir = Config.serialDir,
+											     file = #domain fs}
+
+						       val oldSerial = let
+							   val inf = TextIO.openIn serialPath
+						       in
+							   SOME (readLine inf)
+							   before TextIO.closeIn inf
+						       end handle IO.Io {name, ...} => NONE
+
+						       val newSerial =
+							   case serial of
+							       SOME n => Int.toString n
+							     | NONE =>
+							       let
+								   val prefix = dateString ()
+							       in
+								   prefix
+								   ^ (case oldSerial of
+									  NONE => "00"
+									| SOME old =>
+									  if size old >= 8 andalso
+									     String.substring (old, 0, 8) = prefix then
+									      case Int.fromString (String.extract (old, 8, NONE)) of
+										  NONE => "00"
+										| SOME old => padBy #"0" 2 (Int.toString (old+1))
+									  else
+									      "00")
+							       end
+
+						       val outf = TextIO.openOut serialPath
+						       val _ = TextIO.output (outf, newSerial)
+						       val _ = TextIO.closeOut outf
+
 						       val dns = OS.Path.joinDirFile {dir = #dir fs,
 										      file = "dns"}
 
@@ -166,8 +228,8 @@ val () = Slave.registerFileHandler (fn fs =>
 						       TextIO.output (outf, ns);
 						       TextIO.output (outf, ".\thostmaster.");
 						       TextIO.output (outf, #domain fs);
-						       TextIO.output (outf, ".\n( ");
-						       TextIO.output (outf, Int.toString 123456789);
+						       TextIO.output (outf, ". ( ");
+						       TextIO.output (outf, newSerial);
 						       TextIO.output (outf, " ");
 						       TextIO.output (outf, Int.toString rf);
 						       TextIO.output (outf, " ");
@@ -204,4 +266,8 @@ val () = Slave.registerPostHandler
 				 fn cl => "Error reloading bind with " ^ cl)
 		  else
 		      ()))
+
+val () = Domain.registerResetLocal (fn () =>
+				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/zones/*")))
+
 end