HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
1c1b5d8
..
c33a47d
100644
(file)
--- a/
lib/easy_domain.dtl
+++ b/
lib/easy_domain.dtl
@@
-1,7
+1,10
@@
{{The most common kinds of domain configuration}}
{{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) ->
val webAt =
\ n : (web_node) ->
@@
-16,7
+19,10
@@
val webAt =
end
end;
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) ->
val webAtIp =
\ ip : (your_ip) ->
@@
-33,7
+39,8
@@
val webAtIp =
val addDefaultAlias = begin
mailbox <- Mailbox;
val addDefaultAlias = begin
mailbox <- Mailbox;
- defaultAlias mailbox
+ source <- DefaultAliasSource;
+ aliasPrim source (addressTarget mailbox)
end;
val addWww = begin
end;
val addWww = begin
@@
-49,9
+56,16
@@
val dom =
\\ config : Domain ->
domain d with
dns (dnsNS "ns1.hcoop.net");
\\ config : Domain ->
domain d with
dns (dnsNS "ns1.hcoop.net");
- dns (dnsNS "ns
3
.hcoop.net");
+ dns (dnsNS "ns
2
.hcoop.net");
- dns (dnsA default (ip_of_node (web_node_to_node web_node)));
+ user_web_node <- DefaultWebNode;
+
+ 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
hmail : bool <- HandleMail;
if hmail then
@@
-62,7
+76,7
@@
val dom =
amx : bool <- AddMX;
if amx then
amx : bool <- AddMX;
if amx then
- dns (dnsMX 1 "
deleuze
.hcoop.net")
+ dns (dnsMX 1 "
mail
.hcoop.net")
else
Skip
end;
else
Skip
end;
@@
-82,7
+96,7
@@
val dom =
end;
config
end;
config
-
end;
+end;
val nameserver = \host -> dns (dnsNS host);
val dnsIP = \from -> \to -> dns (dnsA (literal from) to);
val nameserver = \host -> dns (dnsNS host);
val dnsIP = \from -> \to -> dns (dnsA (literal from) to);
@@
-94,3
+108,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 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";