Unify web_node/default_node, and provide a default for WebPlaces

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

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 2a58423..c33a47d 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -1,9 +1,11 @@
 {{The most common kinds of domain configuration}}
 
-val default_node : (node) = "mire";
-val web_node : (web_node) = "mire";
+val web_node : (web_node) = "navajos";
+val default_node : (node) = web_node_to_node web_node;
 val web_ip = ip_of_node (web_node_to_node web_node);
 
+var WebPlaces = [web_place_default web_node];
+
 val webAt =
   \ n : (web_node) ->
   \ host : (host) ->
@@ -37,7 +39,8 @@ val webAtIp =
 
 val addDefaultAlias = begin
   mailbox <- Mailbox;
-  defaultAlias mailbox
+  source <- DefaultAliasSource;
+  aliasPrim source (addressTarget mailbox)
 end;
 
 val addWww = begin
@@ -106,3 +109,5 @@ 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";