HCoop
/
hcoop
/
zz_old
/
domtool2-proto.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06bfa32
)
Catch-all aliases working again
author
adamch
<adamch>
Fri, 14 Dec 2007 23:36:32 +0000
(23:36 +0000)
committer
adamch
<adamch>
Fri, 14 Dec 2007 23:36:32 +0000
(23:36 +0000)
lib/easy_domain.dtl
patch
|
blob
|
blame
|
history
scripts/domtool-publish
patch
|
blob
|
blame
|
history
diff --git
a/lib/easy_domain.dtl
b/lib/easy_domain.dtl
index
c4b3d4f
..
795dd08
100644
(file)
--- a/
lib/easy_domain.dtl
+++ b/
lib/easy_domain.dtl
@@
-30,9
+30,11
@@
val webAtIp =
end
end;
end
end;
-val addDefaultAlias = begin
+val catchAllAlias = \ mailbox -> aliasPrim catchAllSource (addressTarget mailbox);
+
+val addCatchAllAlias = begin
mailbox <- Mailbox;
mailbox <- Mailbox;
-
default
Alias mailbox
+
catchAll
Alias mailbox
end;
val addWww = begin
end;
val addWww = begin
@@
-71,7
+73,7
@@
val domNoWww =
\\ config : Domain ->
domNoWwwNoDefaultAlias d with
config;
\\ config : Domain ->
domNoWwwNoDefaultAlias d with
config;
- add
Default
Alias;
+ add
CatchAll
Alias;
end;
val dom =
end;
val dom =
@@
-79,7
+81,7
@@
val dom =
\\ config : Domain ->
domNoDefaultAlias d with
config;
\\ config : Domain ->
domNoDefaultAlias d with
config;
- add
Default
Alias;
+ add
CatchAll
Alias;
end;
val nameserver = \host -> dns (dnsNS host);
end;
val nameserver = \host -> dns (dnsNS host);
diff --git
a/scripts/domtool-publish
b/scripts/domtool-publish
index
3ce7c7d
..
63c5312
100755
(executable)
--- a/
scripts/domtool-publish
+++ b/
scripts/domtool-publish
@@
-46,7
+46,7
@@
case $1 in
;;
exim)
/bin/cp /var/domtool/aliases /etc/aliases.hosted
;;
exim)
/bin/cp /var/domtool/aliases /etc/aliases.hosted
- #/bin/cp /var/domtool/aliases.default /etc/
+ /bin/cp /var/domtool/aliases.default /etc/aliases.wildcard
redo_exim
;;
mailman)
redo_exim
;;
mailman)