thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.24, 1.25
cvs at kolab.org
cvs at kolab.org
Fri Mar 7 17:49:27 CET 2008
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv23334/kolabd/kolabd/templates
Modified Files:
httpd.conf.template.in
Log Message:
Enforce SSL for fbview and corrected Location entries
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- httpd.conf.template.in 7 Mar 2008 16:35:02 -0000 1.24
+++ httpd.conf.template.in 7 Mar 2008 16:49:25 -0000 1.25
@@ -141,15 +141,26 @@
#DirectoryIndex index.html
AccessFileName .htaccess
-<Location @webserver_web_prefix@/>
- ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/
+<Location "@webserver_web_prefix@/">
+ ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/
+</Location>
+<Location "@kolab_wui@">
+ SSLRequireSSL
</Location>
<Location "@webserver_web_prefix@/horde">
ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/horde/
+ SSLRequireSSL
</Location>
<Location "@webserver_web_prefix@/fbview">
ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
+ SSLRequireSSL
</Location>
+@@@if apache-http@@@
+@@@else@@@
+<Location "@webserver_web_prefix@/freebusy">
+ SSLRequireSSL
+</Location>
+@@@endif@@@
<Files ~ "^\.ht">
Order allow,deny
@@ -192,28 +203,6 @@
Order allow,deny
Allow from all
</Directory>
-
-<Location /admin>
- SSLRequireSSL
-</Location>
-<Location /horde>
- SSLRequireSSL
-</Location>
-@@@if apache-http@@@
-@@@else@@@
-<Location /fbview>
- SSLRequireSSL
-</Location>
-<Location /freebusy>
- SSLRequireSSL
-</Location>
-@@@endif@@@
-
-#<Location /freebusy>
-# SSLVerifyClient require
-# SSLVerifyDepth 1
-#ForceType application/x-httpd-php
-#</Location>
<AuthnProviderAlias ldap ldap-mail>
AuthLDAPURL ldap://@@@ldap_ip@@@:@@@ldap_port@@@/@@@base_dn@@@?mail
More information about the commits
mailing list