steffen: server/kolab/kolab/templates freebusy.conf.template, 1.3, 1.4 httpd.conf.template, 1.2, 1.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusy.conf.template httpd.conf.template 
Log Message:
new fb stuff

Index: freebusy.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/freebusy.conf.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusy.conf.template	24 Jun 2004 23:04:49 -0000	1.3
+++ freebusy.conf.template	30 Jun 2004 10:42:50 -0000	1.4
@@ -1,17 +1,14 @@
 <?php
 
+// Kolab prefix
+$params['kolab_prefix'] = '@l_prefix@';
+
 // What is the address of the Cyrus server where the calendar data is stored?
 // This is also used as the LDAP server address where user objects reside
 $params['server'] = '@@@fqhostname@@@';
 
 // What is the Base DN of our LDAP database?
 $params['base_dn'] = '@@@base_dn@@@';
-
-// What DN should we use to bind to the LDAP server?
-$params['bind_dn'] = '@@@php_dn@@@';
-
-// What password should we use with the above DN when binding?
-$params['bind_pw'] = '@@@php_pw@@@';
 
 // Are we using a multi-location setup? If this is true, we check the users'
 // LDAP object for the next attribute - if it is different than $params['server']

Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- httpd.conf.template	11 Jun 2004 08:55:05 -0000	1.2
+++ httpd.conf.template	30 Jun 2004 10:42:50 -0000	1.3
@@ -19,12 +19,23 @@
 SSLRandomSeed           startup builtin
 SSLRandomSeed           connect builtin
 
+# FreeBusy list handling
+RewriteEngine On
+RewriteLog "/tmp/rewrite.log"
+RewriteLogLevel 9
+RewriteRule ^/freebusy/([^/]+).vfb /phpscripts/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+).xfb /phpscripts/freebusy.php?x=1&uid=$1
+
+
 <VirtualHost _default_:443>
 SSLEngine               on
 SSLCipherSuite          ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
 SSLCertificateFile      @l_prefix@/etc/kolab/cert.pem
 SSLCertificateKeyFile   @l_prefix@/etc/kolab/key.pem
 
+RewriteEngine On
+RewriteOptions inherit
+
 <Files ~ "\.(cgi|shtml|phtml|php4|php3?)$">
    SSLOptions +StdEnvVars
 </Files>
@@ -34,12 +45,6 @@
 </Directory>
 	
 </VirtualHost>
-
-<Location /freebusy>
-#  SSLVerifyClient require
-#  SSLVerifyDepth 1
-ForceType application/x-httpd-php
-</Location>
     
 #<IfModule !mpm_winnt.c>
 #<IfModule !mpm_netware.c>
@@ -166,33 +171,38 @@
 
 @@@legacy-mode@@@
 
-#<Directory "@l_prefix@/var/kolab/www/freebusy">
-#
-#   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>
+#<Location /freebusy>
+#  SSLVerifyClient require
+#  SSLVerifyDepth 1
+#ForceType application/x-httpd-php
+#</Location>
+
+<Directory "@l_prefix@/var/kolab/www/freebusy">
+   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 "@l_prefix@/var/kolab/www/webcalendar">
    Dav On