steffen: server/kolabd/kolabd/templates httpd.conf.template, 1.5, 1.6 legacy.conf.template, 1.1.1.1, NONE

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	httpd.conf.template 
Removed Files:
	legacy.conf.template 
Log Message:
no extra template file for legacy mode

Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- httpd.conf.template	7 Apr 2005 06:56:22 -0000	1.5
+++ httpd.conf.template	28 May 2005 22:09:06 -0000	1.6
@@ -176,7 +176,18 @@
 
 DavLockDB @l_prefix@/var/kolab/www/locks/DAVlock
 
-@@@legacy-mode@@@
+<Location /admin>
+	SSLRequireSSL
+</Location>
+@@@if apache-http@@@
+@@@else@@@
+<Location /fbview>
+	SSLRequireSSL
+</Location>
+<Location /freebusy>
+	SSLRequireSSL
+</Location>
+@@@endif@@@
 
 #<Location /freebusy>
 #  SSLVerifyClient require
@@ -186,7 +197,7 @@
 
 <Directory "@l_prefix@/var/kolab/www/freebusy">
    #Dav On
-   Script PUT /freebusy/freebusy.php
+   #Script PUT /freebusy/freebusy.php
    AllowOverride None
    Options None
    # Disallow for everyone as default
@@ -249,7 +260,6 @@
 <Directory "/kolab/var/kolab/www/fbview">
     AllowOverride All
     Allow from all
-    SSLRequireSSL
     php_value include_path ".:@l_prefix@/var/kolab/php:@l_prefix@/var/kolab/php/pear:/php/include:@l_prefix@/lib/php"
 </Directory>
 
@@ -271,7 +281,6 @@
    #Base_DN "@@@base_dn@@@"
    #UID_Attr uid
    #require valid-user
-   SSLRequireSSL
 </Directory>
 
 AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip

--- legacy.conf.template DELETED ---