X-Git-Url: http://git.hcoop.net/hcoop/zz_old/domtool2-proto.git/blobdiff_plain/fc114810584dbe5be2d6ad7f8fdcace6505b9171..7cfb21d80b8b5247cb2c94600c048abacb882c5f:/lib/easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 7ed29a4..82c66bf 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -10,14 +10,27 @@ 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 dom =
+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
@@ -28,18 +41,34 @@ val dom =
 
 			handleMail;
 			dns (dnsMX 1 "deleuze.hcoop.net");
-			mailbox <- Mailbox;
-			defaultAlias mailbox;
-
-			web "www" with
-				serverAliasDefault;
-				www : [Vhost] <- WWW;
-				www
-			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;
+		  addDefaultAlias;
+		end;
+
 val nameserver = \host -> dns (dnsNS host);
 val dnsIP = \from -> \to -> dns (dnsA from to);
 val dnsMail = \num -> \host -> dns (dnsMX num host);