domNoWww

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

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index aef0232..cb63932 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -17,7 +17,20 @@ val webAt =
 
 val web = webAt web_node;
 
 
 val web = webAt web_node;
 

-val domNoDefaultAlias =
+val addDefaultAlias = begin
+  mailbox <- Mailbox;
+  defaultAlias mailbox
+end;
+
+val addWww = begin
+  web "www" with
+    serverAliasDefault;
+    www : [Vhost] <- WWW;
+    www
+  end
+end;
+
+val domNoWwwNoDefaultAlias =

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


@@ -29,22 +42,31 @@ val domNoDefaultAlias =
                        handleMail;
                        dns (dnsMX 1 "deleuze.hcoop.net");
 
                        handleMail;
                        dns (dnsMX 1 "deleuze.hcoop.net");
 

-                       web "www" with
-                               serverAliasDefault;
-                               www : [Vhost] <- WWW;
-                               www
-                       end;
-

                        config
                end;
 
                        config
                end;
 

+val domNoDefaultAlias =
+       \ d : (your_domain) ->
+       \\ config : Domain ->
+               domNoWwwNoDefaultAlias d with
+                 addWww;
+                 config
+               end;
+
+val domNoWww =
+       \ d : (your_domain) ->
+       \\ config : Domain ->
+               domNoWwwNoDefaultAlias d with
+                 config;
+                 addDefaultAlias;
+               end;
+

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

-                 mailbox <- Mailbox;
-                 defaultAlias mailbox;
+                 addDefaultAlias;

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