[packaging] Branch 'feature-el6-kolab-2.4' - 2 commits - freebusy.conf php-pear-Kolab-FreeBusy.spec

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu May 31 13:38:31 CEST 2012


 freebusy.conf                |   33 +++++++++++++++++----------------
 php-pear-Kolab-FreeBusy.spec |    4 ++--
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit ad53ef4b91eb2cb7271044ea9c54e67f0a0d3594
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 31 13:38:26 2012 +0200

    Bump release

diff --git a/php-pear-Kolab-FreeBusy.spec b/php-pear-Kolab-FreeBusy.spec
index b99f9ab..e7e8a2f 100644
--- a/php-pear-Kolab-FreeBusy.spec
+++ b/php-pear-Kolab-FreeBusy.spec
@@ -5,7 +5,7 @@
 
 Name:               php-pear-Kolab-FreeBusy
 Version:            0.5.4
-Release:            0.6%{?snapshot}%{?dist}
+Release:            0.7%{?snapshot}%{?dist}
 Summary:            A package for providing free/busy information
 License:            LGPL
 Group:              Productivity/Networking/Web/Servers
@@ -102,7 +102,7 @@ fi
 %attr(0770,kolab,apache) %dir %{_localstatedir}/lib/kolab/freebusy
 
 %changelog
-* Thu May 31 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.5.4-0.6dev5
+* Thu May 31 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.5.4-0.7dev5
 - Include httpd configuration snippet to rewrite /freebusy.* to the relevant .php
 
 * Fri Aug 19 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.5.4-0.5dev5


commit ead200e46833bd64ce4719e2f45569c9f6241201
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 31 13:37:43 2012 +0200

    Correct free/busy configuration

diff --git a/freebusy.conf b/freebusy.conf
index 7b35886..52815ee 100644
--- a/freebusy.conf
+++ b/freebusy.conf
@@ -1,18 +1,19 @@
-Alias /freebusy /usr/share/kolab/freebusy/
-
 # FreeBusy list handling
-#RewriteLog "/tmp/rewrite.log"
-#RewriteLogLevel 9
+RewriteLog "logs/rewrite_log"
+RewriteLogLevel 9
+
+<Directory "/usr/share/kolab/freebusy/">
+    Order Allow,Deny
+    Allow from All
+</Directory>
 
-<LocationMatch "/freebusy.*">
-    RewriteEngine On
-    # Without DOCUMENT_ROOT the rewrite engine uses a real /freebusy directory
-    # on the filesystem before %{DOCUMENT_ROOT}/freebusy.  This may result in
-    # unexpected behaviour.
-    RewriteRule ^/freebusy/([^/]+)\.ifb         /usr/share/kolab/freebusy/freebusy.php?uid=$1
-    RewriteRule ^/freebusy/([^/]+)\.vfb         /usr/share/kolab/freebusy/freebusy.php?uid=$1
-    RewriteRule ^/freebusy/([^/]+)\.xfb         /usr/share/kolab/freebusy/freebusy.php?uid=$1&extended=1
-    RewriteRule ^/freebusy/trigger/(.+)\.pfb    /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0
-    RewriteRule ^/freebusy/(.+)\.pfb            /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1
-    RewriteRule ^/freebusy/(.+)\.pxfb           /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1&extended=1
-</LocationMatch>
+RewriteEngine On
+# Without DOCUMENT_ROOT the rewrite engine uses a real /freebusy directory
+# on the filesystem before %{DOCUMENT_ROOT}/freebusy.  This may result in
+# unexpected behaviour.
+RewriteRule ^/freebusy/([^/]+)\.ifb         /usr/share/kolab/freebusy/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.vfb         /usr/share/kolab/freebusy/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.xfb         /usr/share/kolab/freebusy/freebusy.php?uid=$1&extended=1
+RewriteRule ^/freebusy/trigger/(.+)\.pfb    /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0
+RewriteRule ^/freebusy/(.+)\.pfb            /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1
+RewriteRule ^/freebusy/(.+)\.pxfb           /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1&extended=1




More information about the packaging-commits mailing list