Improved Easy_domain, with boolean env vars

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

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 952bcfb..9934be4 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -30,9 +30,9 @@ val webAtIp =
          end
        end;
 
          end
        end;
 

-val addCatchAllAlias = begin
+val addDefaultAlias = begin

   mailbox <- Mailbox;
   mailbox <- Mailbox;

-  catchAllAlias mailbox
+  defaultAlias mailbox

 end;
 
 val addWww = begin
 end;
 
 val addWww = begin


@@ -43,7 +43,7 @@ val addWww = begin
   end
 end;
 
   end
 end;
 

-val domNoWwwNoDefaultAlias =
+val dom =

        \ d : (your_domain) ->
        \\ config : Domain ->
                domain d with
        \ d : (your_domain) ->
        \\ config : Domain ->
                domain d with


@@ -55,31 +55,21 @@ val domNoWwwNoDefaultAlias =
                        handleMail;
                        dns (dnsMX 1 "deleuze.hcoop.net");
 
                        handleMail;
                        dns (dnsMX 1 "deleuze.hcoop.net");
 

-                       config
-               end;
-
-val domNoDefaultAlias =
-       \ d : (your_domain) ->
-       \\ config : Domain ->
-               domNoWwwNoDefaultAlias d with
-                 addWww;
-                 config
-               end;
+                       createWWW : bool <- CreateWWW;
+                       if createWWW then
+                         addWww
+                       else
+                         Skip
+                       end;

 
 

-val domNoWww =
-       \ d : (your_domain) ->
-       \\ config : Domain ->
-               domNoWwwNoDefaultAlias d with
-                 config;
-                 addCatchAllAlias;
-               end;
+                       defAl : bool <- DefaultAlias;
+                       if defAl then
+                         addDefaultAlias
+                       else
+                         Skip
+                       end;

 
 

-val dom =
-       \ d : (your_domain) ->
-       \\ config : Domain ->
-               domNoDefaultAlias d with
-                 config;
-                 addCatchAllAlias;
+                       config

                end;
 
 val nameserver = \host -> dns (dnsNS host);
                end;
 
 val nameserver = \host -> dns (dnsNS host);