Remove catchAllAlias in favor of defaultAlias; add better handling of slave servers...

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

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 6025008..03af55f 100644 (file)
--- 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 =
@@ -20,14 +21,18 @@ 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;
+                       dns (dnsMX 1 "deleuze.hcoop.net");
                        mailbox <- Mailbox;
-                       catchAllAlias mailbox;
+                       defaultAlias mailbox;
 
                        web "www" with
+                               serverAliasDefault
                        end;
 
                        config