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 aef0232..9934be4 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -10,14 +10,40 @@ 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 domNoDefaultAlias =
+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
+end;
+
+val addWww = begin
+  web "www" with
+    serverAliasDefault;
+    www : [Vhost] <- WWW;
+    www
+  end
+end;
+
+val dom =
        \ d : (your_domain) ->
        \\ config : Domain ->
                domain d with
@@ -29,24 +55,23 @@ val domNoDefaultAlias =
                        handleMail;
                        dns (dnsMX 1 "deleuze.hcoop.net");
 
-                       web "www" with
-                               serverAliasDefault;
-                               www : [Vhost] <- WWW;
-                               www
+                       createWWW : bool <- CreateWWW;
+                       if createWWW then
+                         addWww
+                       else
+                         Skip
+                       end;
+
+                       defAl : bool <- DefaultAlias;
+                       if defAl then
+                         addDefaultAlias
+                       else
+                         Skip
                        end;
 
                        config
                end;
 
-val dom =
-       \ d : (your_domain) ->
-       \\ config : Domain ->
-               domNoDefaultAlias d with
-                 config;
-                 mailbox <- Mailbox;
-                 defaultAlias mailbox;
-               end;
-
 val nameserver = \host -> dns (dnsNS host);
 val dnsIP = \from -> \to -> dns (dnsA from to);
 val dnsMail = \num -> \host -> dns (dnsMX num host);