X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/728f70338362f7c59b62dd3e0b66d6583808d877..113d72170910c3dd0e9b49c6b46a8ae42df66ab8:/lib/easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 6025008..9934be4 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -1,5 +1,6 @@
 {{The most common kinds of domain configuration}}
 
+val default_node : (node) = "mire";
 val web_node : (web_node) = "mire";
 
 val webAt =
@@ -9,25 +10,63 @@ 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 ->
 		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 (web_node_to_node web_node)));
 
 			handleMail;
-			mailbox <- Mailbox;
-			catchAllAlias mailbox;
+			dns (dnsMX 1 "deleuze.hcoop.net");
+
+		        createWWW : bool <- CreateWWW;
+		        if createWWW then
+		          addWww
+		        else
+		          Skip
+		        end;
 
-			web "www" with
+		        defAl : bool <- DefaultAlias;
+		        if defAl then
+		          addDefaultAlias
+		        else
+		          Skip
 			end;
 
 			config
@@ -37,3 +76,4 @@ 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);