Mailman and Bind fixes

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

diff --git a/lib/domain.dtl b/lib/domain.dtl
index 8edfa72..f2d3150 100644 (file)
--- a/lib/domain.dtl
+++ b/lib/domain.dtl
@@ -1,5 +1,11 @@
 {{Configuring shared daemons with respect to a particular Internet domain name}}
 
+extern type no_spaces;
+{{Any string with no space characters}}
+
+extern type no_newlines;
+{{Any string with no newline characters}}
+
 extern type ip;
 {{An IP address}}
 
@@ -9,6 +15,28 @@ extern type host;
 extern type domain;
 {{An Internet domain name}}
 
+extern type your_domain;
+{{A domain that you're allowed to configure}}
+
+extern type your_domain_host;
+{{Some host (as a fully-qualified domain name) in one of your domains}}
+
+extern type node;
+{{The name of a server controlled by domtool}}
+
+extern type user;
+extern type group;
+{{UNIX users and groups}}
+
+extern type your_user;
+extern type your_group;
+{{UNIX users and groups that you're allowed to run as}}
+
+extern type your_path;
+{{A filesystem path that you're allowed to use.
+  The set of permitted values is generated from a set of roots by closing it
+  under the subdirectory relation.}}
+
 context Domain;
 {{Configuration directives specific to an Internet domain}}
 
@@ -23,11 +51,22 @@ extern type soa;
 {{DNS start-of-authority record}}
 extern val soa : domain -> serial -> int -> int -> int -> int -> soa;
 
+val defaultSoa = soa "ns.hcoop.net" serialAuto 172800 900 1209600 3600;
+
+extern type master;
+{{Information on the master DNS server for a domain}}
+extern val externalMaster : ip -> master;
+{{A server not controlled by domtool will serve as master.}}
+extern val internalMaster : node -> master;
+{{A server controlled by domtool will serve as master.}}
+
 extern type dnsKind;
 {{How should DNS for this domain be handled?}}
-extern val master : soa -> dnsKind;
-extern val slave : soa -> dnsKind;
+extern val useDns : soa -> master -> [node] -> dnsKind;
+{{We do want DNS services for this domain. Specify the SOA record, information
+  on the server in charge of zone data, and a list of slave servers.}}
 extern val noDns : dnsKind;
+{{No DNS services for this domain.}}
 
-extern val domain : domain -> Domain => [Root] {DNS : dnsKind, TTL : int};
+extern val domain : your_domain -> Domain => [Root] {DNS : dnsKind, TTL : int};
 {{Configure a domain to which you have access rights.}}