X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/539abe030fdace494d2163044467e1d8665589ff..5ea8643aeccc72893077726f7cb0c1ddb09a870e:/lib/easy_domain.dtl?ds=sidebyside

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index e5b1e8d..99a1812 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -17,7 +17,10 @@ val webAt =
     end
   end;
 
-val web = webAt web_node;
+val web = \ host -> \\ config : Vhost -> begin
+  n <- DefaultWebNode;
+  webAt n host with config end;
+end;
 
 val webAtIp =
   \ ip : (your_ip) ->
@@ -50,9 +53,16 @@ val dom =
   \\ config : Domain ->
   domain d with
     dns (dnsNS "ns1.hcoop.net");
-    dns (dnsNS "ns3.hcoop.net");
+    dns (dnsNS "ns2.hcoop.net");
+
+    user_web_node <- DefaultWebNode;
 
-    dns (dnsA default (ip_of_node (web_node_to_node web_node)));
+    defa : bool <- DefaultA;
+    if defa then
+      dns (dnsA default (ip_of_node (web_node_to_node user_web_node)))
+    else
+      Skip
+    end;
 
     hmail : bool <- HandleMail;
     if hmail then
@@ -63,7 +73,7 @@ val dom =
 
     amx : bool <- AddMX;
     if amx then
-      dns (dnsMX 1 "deleuze.hcoop.net")
+      dns (dnsMX 1 "mail.hcoop.net")
     else
       Skip
     end;
@@ -83,7 +93,7 @@ val dom =
     end;
 
     config
-  end;
+end;
 
 val nameserver = \host -> dns (dnsNS host);
 val dnsIP = \from -> \to -> dns (dnsA (literal from) to);
@@ -95,3 +105,6 @@ val dnsDefaultv6 = \to -> dns (dnsAAAA default to);
 val dnsText = \from -> \to -> dns (dnsTXT (srv_literal from) to);
 val dnsDefaultText = \to -> dns (dnsTXT srv_default to);
 
+val dnsWildcardIP = \to -> dns (dnsA wildcard to);
+
+val addDefaultSPF = dnsDefaultText "v=spf1 mx -all";