[Kolab-devel] server/kolab/kolab httpd.conf.template,1.10.2.2,1.10.2.3 by martin at doto.intevation.de

[root at intevation.de]

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv22106/kolab

Modified Files:
      Tag: KOLAB_1_0
	httpd.conf.template 
Log Message:
Martin K.: stricter permissions as tested in 1.0.6 and webcalendar support with
DefChar workaround, Issue352 fix


Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/httpd.conf.template,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- httpd.conf.template	5 Jul 2003 18:31:50 -0000	1.10.2.2
+++ httpd.conf.template	29 Jul 2003 22:27:10 -0000	1.10.2.3
@@ -29,7 +29,7 @@
    SSLOptions +StdEnvVars
 </Files>
 
-<Directory /kolab/var/kolab/www/cgi-bin>
+<Directory "@@@kolab_prefix@@@/var/kolab/www/cgi-bin">
    SSLOptions +StdEnvVars
 </Directory>
 	
@@ -117,7 +117,7 @@
 AccessFileName .htaccess
 
 <Location />
-  ErrorDocument 403 https://@@@fqdn@@@/admin/index.php
+  ErrorDocument 403 https://@@@fqhostname@@@/admin/index.php
 </Location>
 
 <Files ~ "^\.ht">
@@ -190,7 +190,33 @@
    Bind_Pass "@@@php_pw@@@"
    UID_Attr uid
    DavMinTimeout 600
-   
+   AddDefaultCharset Off  
+</Directory>
+
+<Directory "@@@kolab_prefix@@@/var/kolab/www/webcalendar">
+   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 (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 "@@@kolab_prefix@@@/var/kolab/www/admin">