Merge branch 'dbms-in-slave'

[hcoop/domtool2.git] / lib / easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 1c1b5d8..4b9989b 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -2,6 +2,7 @@
 
 val default_node : (node) = "mire";
 val web_node : (web_node) = "mire";
+val web_ip = ip_of_node (web_node_to_node web_node);
 
 val webAt =
   \ n : (web_node) ->
@@ -49,9 +50,14 @@ val dom =
   \\ config : Domain ->
   domain d with
     dns (dnsNS "ns1.hcoop.net");
-    dns (dnsNS "ns3.hcoop.net");
+    dns (dnsNS "ns2.hcoop.net");
 
-    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 web_node)))
+    else
+      Skip
+    end;
 
     hmail : bool <- HandleMail;
     if hmail then
@@ -62,7 +68,7 @@ val dom =
 
     amx : bool <- AddMX;
     if amx then
-      dns (dnsMX 1 "deleuze.hcoop.net")
+      dns (dnsMX 1 "mail.hcoop.net")
     else
       Skip
     end;
@@ -94,3 +100,4 @@ 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);