X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/6eeb3bf97e57bb0f4d0942b9dd436eeb493c1e9f..d4e42f2ac4bd7d403b8b3363c50e1d516074bce1:/lib/easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 0b4027d..cb63932 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -17,26 +17,60 @@ val webAt =
 
 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
-			dns (dnsNS "deleuze.hcoop.net");
-			dns (dnsNS "mire.hcoop.net");
+			dns (dnsNS "ns1.hcoop.net");
+			dns (dnsNS "ns3.hcoop.net");
 
-			dns (dnsDefaultA (ip_of_node default_node));
+			dns (dnsDefaultA (ip_of_node (web_node_to_node web_node)));
 
 			handleMail;
-			mailbox <- Mailbox;
-			catchAllAlias mailbox;
-
-			web "www" with
-			end;
+			dns (dnsMX 1 "deleuze.hcoop.net");
 
 			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);
 val dnsAlias = \from -> \to -> dns (dnsCNAME from to);
+val dnsDefault = \to -> dns (dnsDefaultA to);