apache: fix missing newline in fastScriptAlias

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

diff --git a/src/plugins/exim.sml b/src/plugins/exim.sml
index 112ab5f..b069389 100644 (file)
--- a/src/plugins/exim.sml
+++ b/src/plugins/exim.sml
@@ -20,21 +20,30 @@
 
 structure Exim :> EXIM = struct
 
+open Ast
+
 val aliasesChanged = ref false
 val aliasesDefaultChanged = ref false
+val hostsChanged = ref false
+val relayHostsChanged = ref false
 
 val () = Slave.registerPreHandler
             (fn () => (aliasesChanged := false;
-                       aliasesDefaultChanged := false))
+                       aliasesDefaultChanged := false;
+                       hostsChanged := false))
 
 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.handle" then
+                                              hostsChanged := true
+                                          else if #file spl = "mail.relay" then
+                                              relayHostsChanged := true
                                           else
                                               ()
                                       end)
@@ -42,17 +51,61 @@ 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
                  Slave.concatTo (fn s => s = "aliases.default") Config.Exim.aliasesDefault
              else
                  ();
-             if !aliasesChanged orelse !aliasesDefaultChanged then
+             if !hostsChanged then
+                 Slave.enumerateTo (fn s => s = "mail.handle") ":" Config.Exim.handleDomains
+             else
+                 ();
+             if !relayHostsChanged then
+                 Slave.enumerateTo (fn s => s = "mail.relay") ":" Config.Exim.relayDomains
+             else
+                 ();
+             if !aliasesChanged orelse !aliasesDefaultChanged
+                orelse !hostsChanged orelse !relayHostsChanged then
                  Slave.shellF ([Config.Exim.reload],
                                fn cl => "Error reloading exim with " ^ cl)
              else
                  ()))
 
+
+val () = Env.actionV_none "handleMail"
+        (fn env =>
+            let
+                val nodes = Env.env (Env.list Env.string) (env, "MailNodes")
+            in
+                app (fn node => #close
+                                    (Domain.domainsFile {node = node,
+                                                         name = "mail.handle"}) ()) nodes
+            end)
+
+val () = Env.actionV_none "relayMail"
+        (fn env =>
+            let
+                val nodes = Env.env (Env.list Env.string) (env, "MailNodes")
+            in
+                app (fn node => #close
+                                    (Domain.domainsFile {node = node,
+                                                         name = "mail.relay"}) ()) nodes
+            end)
+
+val () = Domain.registerDescriber (Domain.considerAll
+                                  [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.handle",
+                                                    heading = "E-mail handling is on.",
+                                                    showEmpty = true},
+                                   Domain.Filename {filename = "mail.relay",
+                                                    heading = "E-mail relaying is on.",
+                                                    showEmpty = true}])
+
 end