Working on automatic rmdom for bad domains during regen

[hcoop/domtool2.git] / src / plugins / bind.sml

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index b6a07b6..f08367e 100644 (file)
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -101,14 +101,16 @@ fun writeRecord (evs, r) =
                                     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;
@@ -161,7 +163,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                           fun dnsChanged () =
                                               if #domain fs = !didDomain 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"}
@@ -280,4 +282,12 @@ val () = Slave.registerPostHandler
 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",
+                                                    heading = "DNS zonefile contents",
+                                                    showEmpty = false}])
+
 end