HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mccarthy as admin web server and mail node
[hcoop/domtool2.git]
/
lib
/
apache.dtl
diff --git
a/lib/apache.dtl
b/lib/apache.dtl
index
ebfbeb4
..
c8fc51c
100644
(file)
--- a/
lib/apache.dtl
+++ b/
lib/apache.dtl
@@
-26,12
+26,14
@@
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_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 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]
extern val php5 : php_version;
extern val vhost : host -> Vhost => [Domain]
@@
-71,6
+73,12
@@
extern val directory : your_path -> ^Vhost & Location => [Vhost & !Location];
{{Set some configuration specific to a URI prefix or filesystem directory,
respectively.}}
{{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];
extern val serverAliasHost : your_domain_host -> [Vhost];
{{Give an alternate hostname for this vhost.}}
extern val serverAlias : host -> [Vhost];
@@
-79,3
+87,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 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