[pkg-kolab] r1362 - kolabd/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2009-10-15 21:10:49 +0000 (Thu, 15 Oct 2009)
New Revision: 1362

Modified:
   kolabd/trunk/debian/apache.conf
   kolabd/trunk/debian/changelog
Log:
apache.conf: freebusy is now in /usr/share/php/htdocs


Modified: kolabd/trunk/debian/apache.conf
===================================================================
--- kolabd/trunk/debian/apache.conf	2009-10-15 17:23:21 UTC (rev 1361)
+++ kolabd/trunk/debian/apache.conf	2009-10-15 21:10:49 UTC (rev 1362)
@@ -5,13 +5,13 @@
 RewriteEngine On
 RewriteLog "/var/log/apache2/kolab_rewrite.log"
 RewriteLogLevel 0
-RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/php/www/freebusy.php?uid=$1
-RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/php/www/freebusy.php?uid=$1
-RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/php/www/freebusy.php?uid=$1&extended=1
-RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/php/www/pfb.php?folder=$1&cache=0
-RewriteRule ^/freebusy/(.+)\.pfb /usr/share/php/www/pfb.php?folder=$1&cache=1
-RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/php/www/pfb.php?folder=$1&cache=0&extended=1
-RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/php/www/pfb.php?folder=$1&cache=1&extended=1
+RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/php/htdocs/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/php/htdocs/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/php/htdocs/freebusy.php?uid=$1&extended=1
+RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=0
+RewriteRule ^/freebusy/(.+)\.pfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=1
+RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=0&extended=1
+RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=1&extended=1
 
 SSLEngine		on
 SSLCertificateFile	/etc/kolab/cert.pem

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2009-10-15 17:23:21 UTC (rev 1361)
+++ kolabd/trunk/debian/changelog	2009-10-15 21:10:49 UTC (rev 1362)
@@ -7,8 +7,9 @@
     "Debian - Administrators - Kolab Installation"
   * Add README.source as required by policy 4.14
   * Change my email address, as I am now Debian developer
+  * apache.conf: freebusy is now in /usr/share/php/htdocs
 
- -- Mathieu Parent <sathieu at debian.org>  Thu, 15 Oct 2009 19:22:38 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 15 Oct 2009 23:09:39 +0200
 
 kolabd (2.2.2-20090514-1) unstable; urgency=low