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

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
dissimilarity index 67%
index 0b4027d..2f8c0ab 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -1,42 +1,84 @@
-{{The most common kinds of domain configuration}}
-
-val default_node : (node) = "mire";
-val web_node : (web_node) = "mire";
-
-val webAt =
-	\ n : (web_node) ->
-	\ host : (host) ->
-	\\ config : Vhost ->
-		(dns (dnsA host (ip_of_node (web_node_to_node n)));
-
-		vhost host where
-			WebNodes = [n]
-		with
-			config
-		end);
-
-val web = webAt web_node;
-
-val dom =
-	\ d : (your_domain) ->
-	\\ config : Domain ->
-		domain d with
-			dns (dnsNS "deleuze.hcoop.net");
-			dns (dnsNS "mire.hcoop.net");
-
-			dns (dnsDefaultA (ip_of_node default_node));
-
-			handleMail;
-			mailbox <- Mailbox;
-			catchAllAlias mailbox;
-
-			web "www" with
-			end;
-
-			config
-		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);
+{{The most common kinds of domain configuration}}
+
+val default_node : (node) = "mire";
+val web_node : (web_node) = "mire";
+
+val webAt =
+  \ n : (web_node) ->
+  \ host : (host) ->
+  \\ config : Vhost -> begin
+    dns (dnsA (literal host) (ip_of_node (web_node_to_node n)));
+
+    vhost host where
+      WebPlaces = [web_place_default n]
+    with
+      config
+    end
+  end;
+
+val web = webAt web_node;
+
+val webAtIp =
+  \ ip : (your_ip) ->
+  \ host : (host) ->
+  \\ config : Vhost -> begin
+    dns (dnsA (literal 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 "ns1.hcoop.net");
+    dns (dnsNS "ns3.hcoop.net");
+
+    dns (dnsA default (ip_of_node (web_node_to_node web_node)));
+
+    handleMail;
+    dns (dnsMX 1 "deleuze.hcoop.net");
+
+    createWWW : bool <- CreateWWW;
+    if createWWW then
+      addWww
+    else
+      Skip
+    end;
+
+    defAl : bool <- DefaultAlias;
+    if defAl then
+      addDefaultAlias
+    else
+      Skip
+    end;
+
+    config
+  end;
+
+val nameserver = \host -> dns (dnsNS host);
+val dnsIP = \from -> \to -> dns (dnsA (literal from) to);
+val dnsIPv6 = \from -> \to -> dns (dnsAAAA (literal from) to);
+val dnsMail = \num -> \host -> dns (dnsMX num host);
+val dnsAlias = \from -> \to -> dns (dnsCNAME (literal from) to);
+val dnsDefault = \to -> dns (dnsA default to);
+val dnsDefaultv6 = \to -> dns (dnsAAAA default to);
+val dnsText = \from -> \to -> dns (dnsTXT (literal from) to);
+val dnsDefaultText = \to -> dns (dnsTXT default to);