stuart: server/kolab/kolab/templates proftpd.conf.template, 1.1, 1.2 httpd.conf.template, 1.9, 1.10
cvs at intevation.de
cvs at intevation.de
Thu Sep 16 16:45:37 CEST 2004
Author: stuart
Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv18240
Modified Files:
proftpd.conf.template httpd.conf.template
Log Message:
Change the f/b upload directory to use /freebusy/data directly. This allows Outlook to properly upload .ifb files, which freebusy.php can then use in its caching mechanism.
Index: proftpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/proftpd.conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- proftpd.conf.template 7 Jun 2004 10:33:03 -0000 1.1
+++ proftpd.conf.template 16 Sep 2004 14:45:35 -0000 1.2
@@ -52,7 +52,7 @@
LogFormat write "%h %l %u %t \"%r\" %s %b"
SystemLog @l_prefix@/var/proftpd/proftpd.log
-DefaultRoot @l_prefix@/var/kolab/www/freebusy
+DefaultRoot @l_prefix@/var/kolab/www/freebusy/data
<Global>
IdentLookups off
Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- httpd.conf.template 9 Sep 2004 21:05:09 -0000 1.9
+++ httpd.conf.template 16 Sep 2004 14:45:35 -0000 1.10
@@ -206,6 +206,33 @@
AddDefaultCharset Off
</Directory>
+<Directory "@l_prefix@/var/kolab/www/freebusy/data">
+ 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_Attr uid
+ DavMinTimeout 600
+ AddDefaultCharset Off
+</Directory>
+
<Directory "@l_prefix@/var/kolab/www/webcalendar">
Dav On
AllowOverride None
More information about the commits
mailing list