apache: improved fastScriptAlias

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

diff --git a/lib/apache.dtl b/lib/apache.dtl
index f176787..c56a380 100644 (file)
--- a/lib/apache.dtl
+++ b/lib/apache.dtl
@@ -26,10 +26,18 @@ For others, it has only one value, [true].}}
 extern type ssl_cert_path;
 {{Filesystem path to an SSL certificate in your 'cert' list}}
 
+extern type ssl_cacert_path;
+{{Filesystem path to an intermediate CA certificate in your 'cacert' list}}
+
 extern type ssl;
 extern val no_ssl : ssl;
 extern val use_cert : ssl_cert_path -> ssl;
 
+extern type php_version;
+extern val php5 : php_version;
+extern val fast_php : php_version;
+{{FastCGI based php5. Much faster than regular php5.}}
+
 extern val vhost : host -> Vhost => [Domain]
   {WebPlaces : [web_place],
   SSL : ssl,
@@ -37,13 +45,26 @@ 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
   path to the static content root, and the e-mail address to which error pages
   should direct visitors.}}
 
+extern val vhostDefault : Vhost => [Domain]
+  {WebPlaces : [web_place],
+  SSL : ssl,
+  User : your_user,
+  Group : your_group,
+  DocumentRoot : your_path,
+  ServerAdmin : email,
+  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>}}
+
 context Location;
 
 extern type location;
@@ -54,6 +75,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];
@@ -62,3 +89,9 @@ 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];
+
+extern val sslCertificateChainFile : ssl_cacert_path -> [Vhost];
+{{Intermediate file to serve as part of the chain of authority for
+  your ssl certificate}}
\ No newline at end of file