From: Adam Chlipala <adamc@hcoop.net>
Date: Sat, 17 Nov 2007 20:35:30 +0000 (+0000)
Subject: domNoWww
X-Git-Tag: release_2010-11-19~130
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/d4e42f2ac4bd7d403b8b3363c50e1d516074bce1

domNoWww
---

diff --git a/elisp/domtool-tables.el b/elisp/domtool-tables.el
index a1ca9f7..6fa1419 100644
--- a/elisp/domtool-tables.el
+++ b/elisp/domtool-tables.el
@@ -7,7 +7,7 @@
   "A regexp that matches Domtool contexts from the standard library.")
 
 (defconst domtool-actions-regexp
-  (domtool-syms-re "errorDocument" "scriptAlias" "alias" "proxyPassReverse" "proxyPass" "rewriteLogLevel" "localProxyRewrite" "rewriteBase" "rewriteCond" "rewriteRule" "setEnv" "davFilesystem" "readmeName" "headerName" "unset_indexOptions" "set_indexOptions" "indexOptions" "addDescription" "mailmanWebHost" "dnsDefault" "dnsAlias" "dnsMail" "dnsIP" "nameserver" "dom" "domNoDefaultAlias" "web" "webAt" "relayMail" "handleMail" "dns" "addDefaultCharset" "action" "forceTypeOff" "forceType" "directoryIndex" "unset_options" "set_options" "options" "satisfyAny" "satisfyAll" "denyFrom" "denyFromAll" "allowFrom" "allowFromAll" "orderDenyAllow" "orderAllowDeny" "requireGroup" "requireUser" "requireValidUser" "authUserFile" "authName" "authType" "serverAliasDefault" "serverAlias" "serverAliasHost" "directory" "location" "vhost" "defaultAlias" "aliasDrop" "aliasMulti" "emailAlias" "aliasPrim" "domain")
+  (domtool-syms-re "errorDocument" "scriptAlias" "alias" "proxyPassReverse" "proxyPass" "rewriteLogLevel" "localProxyRewrite" "rewriteBase" "rewriteCond" "rewriteRule" "setEnv" "davFilesystem" "readmeName" "headerName" "unset_indexOptions" "set_indexOptions" "indexOptions" "addDescription" "mailmanWebHost" "dnsDefault" "dnsAlias" "dnsMail" "dnsIP" "nameserver" "dom" "domNoWww" "domNoDefaultAlias" "domNoWwwNoDefaultAlias" "addWww" "addDefaultAlias" "web" "webAt" "relayMail" "handleMail" "dns" "addDefaultCharset" "action" "forceTypeOff" "forceType" "directoryIndex" "unset_options" "set_options" "options" "satisfyAny" "satisfyAll" "denyFrom" "denyFromAll" "allowFrom" "allowFromAll" "orderDenyAllow" "orderAllowDeny" "requireGroup" "requireUser" "requireValidUser" "authUserFile" "authName" "authType" "serverAliasDefault" "serverAlias" "serverAliasHost" "directory" "location" "vhost" "defaultAlias" "aliasDrop" "aliasMulti" "emailAlias" "aliasPrim" "domain")
   "A regexp that matches Domtool actions from the standard library.")
 
 (defconst domtool-vals-regexp
diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index aef0232..cb63932 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -17,7 +17,20 @@ val webAt =
 
 val web = webAt web_node;
 
-val domNoDefaultAlias =
+val addDefaultAlias = begin
+  mailbox <- Mailbox;
+  defaultAlias mailbox
+end;
+
+val addWww = begin
+  web "www" with
+    serverAliasDefault;
+    www : [Vhost] <- WWW;
+    www
+  end
+end;
+
+val domNoWwwNoDefaultAlias =
 	\ d : (your_domain) ->
 	\\ config : Domain ->
 		domain d with
@@ -29,22 +42,31 @@ val domNoDefaultAlias =
 			handleMail;
 			dns (dnsMX 1 "deleuze.hcoop.net");
 
-			web "www" with
-				serverAliasDefault;
-				www : [Vhost] <- WWW;
-				www
-			end;
-
 			config
 		end;
 
+val domNoDefaultAlias =
+	\ d : (your_domain) ->
+	\\ config : Domain ->
+		domNoWwwNoDefaultAlias d with
+		  addWww;
+		  config
+		end;
+
+val domNoWww =
+	\ d : (your_domain) ->
+	\\ config : Domain ->
+		domNoWwwNoDefaultAlias d with
+		  config;
+		  addDefaultAlias;
+		end;
+
 val dom =
 	\ d : (your_domain) ->
 	\\ config : Domain ->
 		domNoDefaultAlias d with
 		  config;
-		  mailbox <- Mailbox;
-		  defaultAlias mailbox;
+		  addDefaultAlias;
 		end;
 
 val nameserver = \host -> dns (dnsNS host);