FilesMatch directive

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

diff --git a/lib/apache.dtl b/lib/apache.dtl
index ed6f8b1..8b7051c 100644 (file)
--- a/lib/apache.dtl
+++ b/lib/apache.dtl
@@ -30,6 +30,10 @@ extern type ssl;
 extern val no_ssl : ssl;
 extern val use_cert : ssl_cert_path -> ssl;
 
+extern type php_version;
+extern val php4 : php_version;
+extern val php5 : php_version;
+
 extern val vhost : host -> Vhost => [Domain]
   {WebPlaces : [web_place],
   SSL : ssl,
@@ -37,7 +41,8 @@ extern val vhost : host -> Vhost => [Domain]
   Group : your_group,
   DocumentRoot : your_path,
   ServerAdmin : email,
-  SuExec : suexec_flag};
+  SuExec : suexec_flag,
+  PhpVersion : php_version};
 {{Add a new named Apache virtual host, specifying which nodes' Apache servers
   should answer requests for this host, whether it should use SSL, what UNIX
   user and group dynamic content generators should be run as, the filesystem
@@ -51,7 +56,8 @@ extern val vhostDefault : Vhost => [Domain]
   Group : your_group,
   DocumentRoot : your_path,
   ServerAdmin : email,
-  SuExec : suexec_flag};
+  SuExec : suexec_flag,
+  PhpVersion : php_version};
 {{Like <tt>vhost</tt>, but for, e.g., <tt>yourdomain.com</tt> instead of
   <tt>www.yourdomain.com</tt>}}
 
@@ -65,6 +71,12 @@ extern val directory : your_path -> ^Vhost & Location => [Vhost & !Location];
 {{Set some configuration specific to a URI prefix or filesystem directory,
   respectively.}}
 
+extern type regexp;
+{{PCRE regular expression}}
+
+extern val filesMatch : regexp -> ^Vhost & Location => [Vhost & !Location];
+{{Mark nested configuration to only apply to filenames matching the regexp.}}
+
 extern val serverAliasHost : your_domain_host -> [Vhost];
 {{Give an alternate hostname for this vhost.}}
 extern val serverAlias : host -> [Vhost];
@@ -73,3 +85,5 @@ extern val serverAlias : host -> [Vhost];
 extern val serverAliasDefault : [Vhost];
 {{Like serverAliasDefault, but adds aliases for the domains being configured
   instead of any of their hosts/"subdomains".}}
+
+extern val testNoHtaccess : [Location];