wilde: server/kolabd/kolabd/templates httpd.conf.template.in, 1.6, 1.7

[cvs at kolab.org]

Author: wilde

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv543/kolabd/kolabd/templates

Modified Files:
	httpd.conf.template.in 
Log Message:
Fixed restrictions on /fbview.  Fixes issue 1507.


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- httpd.conf.template.in	8 Jan 2007 01:02:39 -0000	1.6
+++ httpd.conf.template.in	2 Feb 2007 16:12:17 -0000	1.7
@@ -135,19 +135,15 @@
 AccessFileName .htaccess
 
 <Location @webserver_web_prefix@/>
-  ErrorDocument 403 https://@@@fqdnhostname@@@/@webserver_web_prefix@/admin/
+  ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/admin/
 </Location>
-<Location @webserver_web_prefix@/fbview/*.php>
+<Location "@webserver_web_prefix@/fbview">
     Deny from all
-    ErrorDocument 403 https://@@@fqdnhostname@@@/@webserver_web_prefix@/fbview/
+    ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
 </Location>
-<Location @webserver_web_prefix@/fbview/index.php>
+<Location ~ "@webserver_web_prefix@/fbview/(index.php|login.php)?$">
     Order allow,deny
     Allow from all
-</Location>
-<Location @webserver_web_prefix@/fbview/login.php>
-    Order allow,deny
-	Allow from all
 </Location>
 
 <Files ~ "^\.ht">