Change some node filenames to avoid clashes with subdomains

diff --git a/src/domain.sml b/src/domain.sml
index 488d7a8..700fac1 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -609,7 +609,7 @@ val _ = Env.containerV_one "domain"
 
                                   fun saveSoa (kind, soa : soa) node =
                                       let
-                                          val {write, writeDom, close} = domainsFile {node = node, name = "soa"}
+                                          val {write, writeDom, close} = domainsFile {node = node, name = "soa.conf"}
                                       in
                                           write kind;
                                           write "\n";
@@ -979,7 +979,7 @@ fun considerAll ds {node, domain} =
            ""
     end
 
-val () = registerDescriber (considerAll [Filename {filename = "soa",
+val () = registerDescriber (considerAll [Filename {filename = "soa.conf",
                                                   heading = "DNS SOA:",
                                                   showEmpty = false}])
 

diff --git a/src/plugins/alias.sml b/src/plugins/alias.sml
index 139c2fb..2dbb44e 100644 (file)
--- a/src/plugins/alias.sml
+++ b/src/plugins/alias.sml
@@ -56,7 +56,7 @@ fun reopenAliasesD () = (SM.app (fn {close, ...} => close ()) (!aliasesD);
                         aliasesD := openInAll "aliases.default")
 
 val _ = Domain.registerBefore
-           (fn _ => (aliases := openInAll "aliases";
+           (fn _ => (aliases := openInAll "aliases.base";
                      reopenAliasesD ()))
        
 val _ = Domain.registerAfter

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index 768478f..10892a2 100644 (file)
--- 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
@@ -244,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
@@ -292,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"}
@@ -329,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)
@@ -354,7 +354,7 @@ 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}])
 

diff --git a/src/plugins/exim.sml b/src/plugins/exim.sml
index ee036ce..05e88e9 100644 (file)
--- a/src/plugins/exim.sml
+++ b/src/plugins/exim.sml
@@ -42,11 +42,11 @@ val () = Slave.registerFileHandler (fn fs =>
                                       let
                                           val spl = OS.Path.splitDirFile (#file fs)
                                       in
-                                          if #file spl = "aliases" then
+                                          if #file spl = "aliases.base" then
                                               aliasesChanged := true
                                           else if #file spl = "aliases.default" then
                                               aliasesDefaultChanged := true
-                                          else if #file spl = "mail" then
+                                          else if #file spl = "mail.handle" then
                                               hostsChanged := true
                                           else if #file spl = "mail.relay" then
                                               relayHostsChanged := true
@@ -57,7 +57,7 @@ val () = Slave.registerFileHandler (fn fs =>
 val () = Slave.registerPostHandler
         (fn () =>
             (if !aliasesChanged then
-                 Slave.concatTo (fn s => s = "aliases") Config.Exim.aliases
+                 Slave.concatTo (fn s => s = "aliases.base") Config.Exim.aliases
              else
                  ();
              if !aliasesDefaultChanged then
@@ -65,7 +65,7 @@ val () = Slave.registerPostHandler
              else
                  ();
              if !hostsChanged then
-                 Slave.enumerateTo (fn s => s = "mail") ":" Config.Exim.handleDomains
+                 Slave.enumerateTo (fn s => s = "mail.handle") ":" Config.Exim.handleDomains
              else
                  ();
              if !relayHostsChanged then
@@ -87,7 +87,7 @@ val () = Env.actionV_none "handleMail"
             in
                 app (fn node => #close
                                     (Domain.domainsFile {node = node,
-                                                         name = "mail"}) ()) nodes
+                                                         name = "mail.handle"}) ()) nodes
             end)
 
 val () = Env.actionV_none "relayMail"
@@ -101,13 +101,13 @@ val () = Env.actionV_none "relayMail"
             end)
 
 val () = Domain.registerDescriber (Domain.considerAll
-                                  [Domain.Filename {filename = "aliases",
+                                  [Domain.Filename {filename = "aliases.base",
                                                     heading = "E-mail aliases:",
                                                     showEmpty = false},
                                    Domain.Filename {filename = "aliases.default",
                                                     heading = "Default e-mail alias:",
                                                     showEmpty = false},
-                                   Domain.Filename {filename = "mail",
+                                   Domain.Filename {filename = "mail.handle",
                                                     heading = "E-mail handling is on.",
                                                     showEmpty = true},
                                    Domain.Filename {filename = "mail.relay",

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index 854c91a..a4f5a6c 100644 (file)
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -69,7 +69,7 @@ val () = Env.action_one "mailmanWebHost"
                        (fn host =>
                            let
                                val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node,
-                                                                                  name = "mailman"}
+                                                                                  name = "mailman.conf"}
                            in
                                write "\t'";
                                write host;
@@ -175,15 +175,15 @@ val () = Slave.registerFileHandler (fn fs =>
                                           val spl = OS.Path.splitDirFile (#file fs)
                                       in
                                           case #file spl of
-                                              "mailman" => mailmanChanged := true
+                                              "mailman.conf" => mailmanChanged := true
                                             | _ => ()
                                       end)
 
 val () = Slave.registerPostHandler (fn () =>
                                       if !mailmanChanged then
-                                          (Slave.concatTo (fn s => s = "mailman")
+                                          (Slave.concatTo (fn s => s = "mailman.conf")
                                                           Config.Mailman.mapFile;
-                                           Slave.enumerateTo (fn s => s = "mailman") ":"
+                                           Slave.enumerateTo (fn s => s = "mailman.conf") ":"
                                                              Config.Mailman.handleDomains;
                                                              Slave.shellF ([Config.Mailman.reload],
                                                       fn cl => "Error reloading Mailman with " ^ cl))
@@ -191,7 +191,7 @@ val () = Slave.registerPostHandler (fn () =>
                                           ())
 
 val () = Domain.registerDescriber (Domain.considerAll
-                                  [Domain.Filename {filename = "mailman",
+                                  [Domain.Filename {filename = "mailman.conf",
                                                     heading = "Mailman web host mapping:",
                                                     showEmpty = false}])