X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/e0b0abd209a1ecbd9266cfcf8735af171f96869b..63ac3b82c1cd33605e62688cd97688a6dae3cb9c:/lib/alias.dtl

diff --git a/lib/alias.dtl b/lib/alias.dtl
index b7ccae4..e84d0a7 100644
--- a/lib/alias.dtl
+++ b/lib/alias.dtl
@@ -13,11 +13,7 @@ extern type aliasSource;
 extern val userSource : emailUser -> aliasSource;
 {{The part appear before the "@" in your desired source address}}
 extern val defaultSource : aliasSource;
-{{Matches any mail to this domain that doesn't match any other rule, with the
-  exception of systemwide usernames like UNIX users.}}
-extern val catchAllSource : aliasSource;
-{{Matches any mail to this domain that doesn't match any other rule, even
-  for systemwide usernames.}}
+{{Matches any mail to this domain that doesn't match any other rule.}}
 
 extern type aliasTarget;
 {{A place to redirect messages}}
@@ -28,11 +24,11 @@ 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.}}
 
-val alias = \user -> \email -> aliasPrim (userSource user) (addressTarget email);
+val emailAlias = \user -> \email -> aliasPrim (userSource user) (addressTarget email);
 {{Redirect mail for the user at the current domain to the e-mail address.}}
 val aliasMulti = \user -> \emails -> aliasPrim (userSource user) (addressesTarget emails);
 {{Redirect mail for the user at the current domain to all of the e-mail
@@ -41,8 +37,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 rule, send it to
+  this e-mail address.}}