steffen: server/kolab/kolab/templates httpd.conf.template, 1.16, 1.17
cvs at intevation.de
cvs at intevation.de
Mon Oct 18 13:36:03 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv21295
Modified Files:
httpd.conf.template
Log Message:
sorry, no legacy ftp support currently
Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- httpd.conf.template 14 Oct 2004 14:28:28 -0000 1.16
+++ httpd.conf.template 18 Oct 2004 11:36:01 -0000 1.17
@@ -196,7 +196,7 @@
Require valid-user
</Limit>
AuthType Basic
- AuthName "Kolab Freebusy (webdav)"
+ AuthName "Kolab Freebusy"
LDAP_Server @@@ldap_ip@@@
LDAP_Port @@@ldap_port@@@
@@ -210,33 +210,6 @@
UID_Filter "(|(uid=%u)(mail=%u))"
DavMinTimeout 600
AddDefaultCharset Off
-</Directory>
-
-<Directory "@l_prefix@/var/kolab/www/freebusy/cache">
- Dav On
- AllowOverride None
- Options None
- # Disallow for everyone as default
- Order allow,deny
- <Limit GET PUT LOCK UNLOCK PROPFIND HEAD OPTIONS>
- Allow from all
- Require valid-user
- </Limit>
- AuthType Basic
- AuthName "Kolab Freebusy Upload (WebDAV)"
-
- LDAP_Server @@@ldap_ip@@@
- LDAP_Port @@@ldap_port@@@
- Base_DN "@@@base_dn@@@"
- # temporary : openldap changed from 2.1.9 to 2.1.12
- # anonymous bind with dn is nolonger allowed
- # unfortunately mod_auth_ldap seems to exactly do so
- # need to investigate ...
- Bind_DN "@@@php_dn@@@"
- Bind_Pass "@@@php_pw@@@"
- UID_Filter "(|(uid=%u)(mail=%u))"
- DavMinTimeout 600
- AddDefaultCharset Off
</Directory>
<Directory "@l_prefix@/var/kolab/www/webcalendar">
More information about the commits
mailing list