X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/128e7b0b302e295411797f2465c508013bce4430..06bd821502f57dcb4ef89295b221fc2b9a4f1ae3:/lib/apache.dtl

diff --git a/lib/apache.dtl b/lib/apache.dtl
index db9dc37..483330f 100644
--- a/lib/apache.dtl
+++ b/lib/apache.dtl
@@ -30,26 +30,43 @@ 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,
-	 User : your_user,
-	 Group : your_group,
-	 DocumentRoot : your_path,
-	 ServerAdmin : email,
-	 SuExec : suexec_flag};
+  {WebPlaces : [web_place],
+  SSL : ssl,
+  User : your_user,
+  Group : your_group,
+  DocumentRoot : your_path,
+  ServerAdmin : email,
+  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;
 {{A valid URI prefix}}
 
-extern val location : location -> Vhost & Location => [Vhost & !Location];
+extern val location : location -> ^Vhost & Location => [Vhost & !Location];
 extern val directory : your_path -> ^Vhost & Location => [Vhost & !Location];
 {{Set some configuration specific to a URI prefix or filesystem directory,
   respectively.}}
@@ -62,3 +79,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];