[pkg-kolab] r544 - kolab-resource-handlers/trunk/debian
Steffen Joeris
white-guest at alioth.debian.org
Fri Dec 1 22:32:08 CET 2006
Author: white-guest
Date: 2006-12-01 22:32:08 +0100 (Fri, 01 Dec 2006)
New Revision: 544
Added:
kolab-resource-handlers/trunk/debian/apache2-kolab.conf
Removed:
kolab-resource-handlers/trunk/debian/apache.conf
Modified:
kolab-resource-handlers/trunk/debian/changelog
kolab-resource-handlers/trunk/debian/rules
Log:
* rename the apache conf file
Deleted: kolab-resource-handlers/trunk/debian/apache.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache.conf 2006-12-01 21:13:57 UTC (rev 543)
+++ kolab-resource-handlers/trunk/debian/apache.conf 2006-12-01 21:32:08 UTC (rev 544)
@@ -1,56 +0,0 @@
-NameVirtualHost *:443
-<VirtualHost *:443>
-
- # FreeBusy list rewrite rules
- RewriteEngine On
- RewriteLog "/var/log/apache2/kolab_rewrite.log"
- RewriteLogLevel 0
- RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/kolab-resource-handlers/freebusy/freebusy.php?uid=$1
- RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/kolab-resource-handlers/freebusy/freebusy.php?uid=$1
- RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/kolab-resource-handlers/freebusy/freebusy.php?uid=$1&extended=1
- RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=0
- RewriteRule ^/freebusy/(.+)\.pfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=1
- RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=0&extended=1
- RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=1&extended=1
-
- # Options for freebusy
- <Directory /usr/share/kolab-resource-handlers/freebusy>
- Options Indexes FollowSymLinks
- Order allow,deny
- Allow from all
- </Directory>
-
- DocumentRoot "/var/www"
-
- # Change servername
- ServerName kolabserver.example.com:443
-
- # Contact email address for problems
- ServerAdmin root at example.com
-
- # Special logs
- ErrorLog /var/log/apache2/kolab_error.log
- TransferLog /var/log/apache2/kolab_access.log
- CustomLog /var/log/apache2/kolab_ssl.log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
- # SSL options
- SSLEngine on
- SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
- # Path to server certificate
- SSLCertificateFile /etc/apache2/ssl/apache.pem
-
- <Files ~ "\.(cgi|shtml|phtml|php3?)$">
- SSLOptions +StdEnvVars
- </Files>
-
- # Special IE options
- SetEnvIf User-Agent ".*MSIE.*" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
-
-
- # Pull in kolab-webadmin configuration
- # (Uncomment this if kolab-webadmin is installed.)
- #Include /etc/kolab-webadmin/apache.conf
-
-</VirtualHost>
Copied: kolab-resource-handlers/trunk/debian/apache2-kolab.conf (from rev 543, kolab-resource-handlers/trunk/debian/apache.conf)
Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog 2006-12-01 21:13:57 UTC (rev 543)
+++ kolab-resource-handlers/trunk/debian/changelog 2006-12-01 21:32:08 UTC (rev 544)
@@ -1,9 +1,15 @@
kolab-resource-handlers (0.3.9-20060811-3) UNRELEASED; urgency=medium
+ [ Peter Eisentraut ]
* Fixed path for resmgr.conf (closes: #401116)
* Comment out /etc/kolab-webadmin/apache.conf by default
(closes: #400627)
+ [ Steffen Joeris ]
+ * Renamve apache.conf to apache2-kolab.conf to follow the
+ README.Debian from kolabd and document that we are using the
+ apache2
+
-- Peter Eisentraut <petere at debian.org> Fri, 1 Dec 2006 16:32:58 +0100
kolab-resource-handlers (0.3.9-20060811-2) unstable; urgency=medium
Modified: kolab-resource-handlers/trunk/debian/rules
===================================================================
--- kolab-resource-handlers/trunk/debian/rules 2006-12-01 21:13:57 UTC (rev 543)
+++ kolab-resource-handlers/trunk/debian/rules 2006-12-01 21:32:08 UTC (rev 544)
@@ -44,7 +44,7 @@
# Install conffiles
install -D -m 644 debian/resmgr.conf debian/kolab-resource-handlers/etc/kolab/resmgr.conf
install -D -m 644 debian/freebusy.conf debian/kolab-resource-handlers/etc/kolab/freebusy.conf
- install -D -m 644 debian/apache.conf debian/kolab-resource-handlers/etc/kolab/apache.conf
+ install -D -m 644 debian/apache2-kolab.conf debian/kolab-resource-handlers/etc/kolab/apache2-kolab.conf
binary-indep: build install
dh_testdir
More information about the pkg-kolab-devel
mailing list