HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AuthGroupFile
[hcoop/domtool2.git]
/
src
/
plugins
/
exim.sml
diff --git
a/src/plugins/exim.sml
b/src/plugins/exim.sml
index
f4943ac
..
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
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
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
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
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
else
();
if !aliasesDefaultChanged then
@@
-65,7
+65,7
@@
val () = Slave.registerPostHandler
else
();
if !hostsChanged then
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
else
();
if !relayHostsChanged then
@@
-87,7
+87,7
@@
val () = Env.actionV_none "handleMail"
in
app (fn node => #close
(Domain.domainsFile {node = node,
in
app (fn node => #close
(Domain.domainsFile {node = node,
- name = "mail"}) ()) nodes
+ name = "mail
.handle
"}) ()) nodes
end)
val () = Env.actionV_none "relayMail"
end)
val () = Env.actionV_none "relayMail"
@@
-101,17
+101,17
@@
val () = Env.actionV_none "relayMail"
end)
val () = Domain.registerDescriber (Domain.considerAll
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",
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},
showEmpty = false},
+ Domain.Filename {filename = "mail.handle",
+ heading = "E-mail handling is on.",
+ showEmpty = true},
Domain.Filename {filename = "mail.relay",
Domain.Filename {filename = "mail.relay",
- heading = "E-mail relaying",
- showEmpty =
fals
e}])
+ heading = "E-mail relaying
is on.
",
+ showEmpty =
tru
e}])
end
end