X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/41c58dafe735d17b7d3241bf248ca8806a355926..f3bb0ab3a60b605b4e77042d89b3713930f4ddbb:/src/plugins/exim.sml

diff --git a/src/plugins/exim.sml b/src/plugins/exim.sml
index f4943ac..05e88e9 100644
--- 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,17 +101,17 @@ val () = Env.actionV_none "relayMail"
 	     end)
 
 val () = Domain.registerDescriber (Domain.considerAll
-				   [Domain.Filename {filename = "aliases",
-						     heading = "E-mail 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",
-						     heading = "E-mail handling",
+						     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",
-						     showEmpty = false}])
+						     heading = "E-mail relaying is on.",
+						     showEmpty = true}])
 
 end