Remove catchAllAlias in favor of defaultAlias; add better handling of slave servers...

[hcoop/domtool2.git] / lib / alias.dtl

diff --git a/lib/alias.dtl b/lib/alias.dtl
index 8fe2246..113654b 100644 (file)
--- a/lib/alias.dtl
+++ b/lib/alias.dtl
@@ -28,7 +28,7 @@ extern val addressesTarget : [email] -> aliasTarget;
 extern val dropTarget : aliasTarget;
 {{Silently delete all mail to the associated source.}}
 
-extern val aliasPrim : aliasSource -> aliasTarget -> [Domain] {MailNodes: [node]};
+extern val aliasPrim : aliasSource -> aliasTarget -> [Domain] {MailNodes: [mail_node]};
 {{Request redirection of all mail from the source to the target, specifying on
   which nodes this redirection should be applied.}}
 
@@ -41,8 +41,5 @@ val aliasDrop = \user -> aliasPrim (userSource user) dropTarget;
 {{Silently delete mail to the user at the current domain.}}
 
 val defaultAlias = \email -> aliasPrim defaultSource (addressTarget email);
-{{When a message to the current domain doesn't match any other alias, and it
-  doesn't match any systemwide username, send it to this e-mail address.}}
-val catchAllAlias = \email -> aliasPrim catchAllSource (addressTarget email);
-{{When a message to the current domain doesn't match any other alias, send it
-  to this e-mail address, even if it matches a systemwide username.}}
+{{When a message to the current domain doesn't match any other alias, send it to
+  this e-mail address.}}