From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sat, 29 Mar 2014 01:35:05 +0000 (-0400)
Subject: Easy_domain: Use DefaultAliasSource for DefaultAlias
X-Git-Tag: release_20140328
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/945262dcc47a5e2fed8c3480f0b34fd9b97a7965?hp=f3b84aff36a896635953a771ac1ab7da085a8f52

Easy_domain: Use DefaultAliasSource for DefaultAlias
A catch-all alias by default is deprecated. Rather than eliminating a
default email alias entirely, it will soon default to
$hcoop-username@$domain. Use new DefaultAliasSource environment
variable to change. The default is still a catch-all temporarily.
---

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 60295b2..26f1eb7 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -37,7 +37,8 @@ val webAtIp =
 
 val addDefaultAlias = begin
   mailbox <- Mailbox;
-  defaultAlias mailbox
+  source <- DefaultAliasSource;
+  aliasPrim source (addressTarget mailbox)
 end;
 
 val addWww = begin
diff --git a/src/plugins/easy_domain.sml b/src/plugins/easy_domain.sml
index e486e60..fafe4d5 100644
--- a/src/plugins/easy_domain.sml
+++ b/src/plugins/easy_domain.sml
@@ -1,5 +1,6 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
  * Copyright (c) 2007, Adam Chlipala
+ * Copyright (c) 2014  Clinton Ebadi <clinton@unknownlamer.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -42,6 +43,10 @@ val _ = Defaults.registerDefault ("DefaultAlias",
 				  (TBase "bool", dl),
 				  (fn () => (EVar "true", dl)))
 
+val _ = Defaults.registerDefault ("DefaultAliasSource",
+				  (TBase "aliasSource", dl),
+				  (fn () => (EApp ((EVar "defaultSource", dl), (EString (Domain.getUser ()), dl)), dl)))
+
 val _ = Defaults.registerDefault ("HandleMail",
 				  (TBase "bool", dl),
 				  (fn () => (EVar "true", dl)))