Catch-all aliases working again

[hcoop/zz_old/domtool2-proto.git] / lib / easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index cb63932..795dd08 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -10,16 +10,31 @@ val webAt =
                (dns (dnsA host (ip_of_node (web_node_to_node n)));
 
                vhost host where
-                       WebNodes = [n]
+                       WebPlaces = [web_place_default n]
                with
                        config
                end);
 
 val web = webAt web_node;
 
-val addDefaultAlias = begin
+val webAtIp =
+       \ ip : (your_ip) ->
+       \ host : (host) ->
+       \\ config : Vhost -> begin
+         dns (dnsA host (your_ip_to_ip ip));
+
+         vhost host where
+           WebPlaces = [web_place web_node ip]
+         with
+           config
+         end
+       end;
+
+val catchAllAlias = \ mailbox -> aliasPrim catchAllSource (addressTarget mailbox);
+
+val addCatchAllAlias = begin
   mailbox <- Mailbox;
-  defaultAlias mailbox
+  catchAllAlias mailbox
 end;
 
 val addWww = begin
@@ -58,7 +73,7 @@ val domNoWww =
        \\ config : Domain ->
                domNoWwwNoDefaultAlias d with
                  config;
-                 addDefaultAlias;
+                 addCatchAllAlias;
                end;
 
 val dom =
@@ -66,7 +81,7 @@ val dom =
        \\ config : Domain ->
                domNoDefaultAlias d with
                  config;
-                 addDefaultAlias;
+                 addCatchAllAlias;
                end;
 
 val nameserver = \host -> dns (dnsNS host);