X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/52585297e9d0b707a5d90663baf8aceefbc9910d..a356587aacf682b584fbbebf7b999154755e80c7:/lib/easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 7ed29a4..9934be4 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -10,13 +10,39 @@ 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 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 ->
@@ -28,13 +54,19 @@ val dom =
 
 			handleMail;
 			dns (dnsMX 1 "deleuze.hcoop.net");
-			mailbox <- Mailbox;
-			defaultAlias mailbox;
 
-			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