From: Adam Chlipala <adamc@hcoop.net>
Date: Fri, 14 Dec 2007 23:36:32 +0000 (+0000)
Subject: Catch-all aliases working again
X-Git-Tag: release_2010-11-19~92
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/cd04086681583dd3fcc95b6e12ba312054dc590e

Catch-all aliases working again
---

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index c4b3d4f..795dd08 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -30,9 +30,11 @@ val webAtIp =
 	  end
 	end;
 
-val addDefaultAlias = begin
+val catchAllAlias = \ mailbox -> aliasPrim catchAllSource (addressTarget mailbox);
+
+val addCatchAllAlias = begin
   mailbox <- Mailbox;
-  defaultAlias mailbox
+  catchAllAlias mailbox
 end;
 
 val addWww = begin
@@ -71,7 +73,7 @@ val domNoWww =
 	\\ config : Domain ->
 		domNoWwwNoDefaultAlias d with
 		  config;
-		  addDefaultAlias;
+		  addCatchAllAlias;
 		end;
 
 val dom =
@@ -79,7 +81,7 @@ val dom =
 	\\ config : Domain ->
 		domNoDefaultAlias d with
 		  config;
-		  addDefaultAlias;
+		  addCatchAllAlias;
 		end;
 
 val nameserver = \host -> dns (dnsNS host);
diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index 3ce7c7d..63c5312 100755
--- a/scripts/domtool-publish
+++ b/scripts/domtool-publish
@@ -46,7 +46,7 @@ case $1 in
 	;;
 	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)