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 cb63932..9934be4 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -10,13 +10,26 @@ val webAt =
                (dns (dnsA host (ip_of_node (web_node_to_node n)));
 
                vhost host where
                (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;
 
                with
                        config
                end);
 
 val web = webAt web_node;
 

+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 addDefaultAlias = begin
   mailbox <- Mailbox;
   defaultAlias mailbox
 val addDefaultAlias = begin
   mailbox <- Mailbox;
   defaultAlias mailbox


@@ -30,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


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

-                       config
-               end;
+                       createWWW : bool <- CreateWWW;
+                       if createWWW then
+                         addWww
+                       else
+                         Skip
+                       end;

 
 

-val domNoDefaultAlias =
-       \ d : (your_domain) ->
-       \\ config : Domain ->
-               domNoWwwNoDefaultAlias d with
-                 addWww;
-                 config
-               end;
+                       defAl : bool <- DefaultAlias;
+                       if defAl then
+                         addDefaultAlias
+                       else
+                         Skip
+                       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;
-                 addDefaultAlias;
+                       config

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