HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AuthGroupFile
[hcoop/domtool2.git]
/
lib
/
easy_domain.dtl
diff --git
a/lib/easy_domain.dtl
b/lib/easy_domain.dtl
index
4b9989b
..
60295b2
100644
(file)
--- a/
lib/easy_domain.dtl
+++ b/
lib/easy_domain.dtl
@@
-1,7
+1,7
@@
{{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 default_node : (node) = "
navajos
";
+val web_node : (web_node) = "
navajos
";
val web_ip = ip_of_node (web_node_to_node web_node);
val webAt =
val web_ip = ip_of_node (web_node_to_node web_node);
val webAt =
@@
-17,7
+17,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) ->
@@
-52,9
+55,11
@@
val dom =
dns (dnsNS "ns1.hcoop.net");
dns (dnsNS "ns2.hcoop.net");
dns (dnsNS "ns1.hcoop.net");
dns (dnsNS "ns2.hcoop.net");
+ user_web_node <- DefaultWebNode;
+
defa : bool <- DefaultA;
if defa then
defa : bool <- DefaultA;
if defa then
- dns (dnsA default (ip_of_node (web_node_to_node web_node)))
+ dns (dnsA default (ip_of_node (web_node_to_node
user_
web_node)))
else
Skip
end;
else
Skip
end;
@@
-88,7
+93,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);
@@
-101,3
+106,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 dnsDefaultText = \to -> dns (dnsTXT srv_default to);
val dnsWildcardIP = \to -> dns (dnsA wildcard to);
+
+val addDefaultSPF = dnsDefaultText "v=spf1 mx -all";