[pkg-kolab] r1081 - kolabd/branches/2.2.1/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-17 16:05:43 +0000 (Wed, 17 Dec 2008)
New Revision: 1081

Added:
   kolabd/branches/2.2.1/debian/apache.conf
Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/control
   kolabd/branches/2.2.1/debian/rules
Log:
taken apache.conf from kolab-freebusy


Copied: kolabd/branches/2.2.1/debian/apache.conf (from rev 1060, kolab-freebusy/trunk/debian/apache.conf)
===================================================================
--- kolabd/branches/2.2.1/debian/apache.conf	                        (rev 0)
+++ kolabd/branches/2.2.1/debian/apache.conf	2008-12-17 16:05:43 UTC (rev 1081)
@@ -0,0 +1,59 @@
+NameVirtualHost *:443
+<VirtualHost *:443>
+
+# FreeBusy list handling
+RewriteEngine On
+RewriteLog "/var/log/apache2/kolab_rewrite.log"
+RewriteLogLevel 0
+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/trigger/(.+)\.xpfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0&extended=1
+RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1&extended=1
+
+SSLEngine		on
+SSLCertificateFile	/etc/kolab/cert.pem
+SSLCertificateKeyFile	/etc/kolab/key.pem
+
+<Files ~ "\.(cgi|shtml|phtml|php4|php3?)$">
+  SSLOptions +StdEnvVars
+</Files>
+
+Alias /freebusy /usr/share/kolab/freebusy
+
+<Location /freebusy>
+	SSLRequireSSL
+</Location>
+
+# Options for freebusy
+<Directory /usr/share/kolab/freebusy>
+  #Dav On
+  #Script PUT /freebusy/freebusy.php
+  AllowOverride None
+  Options None
+  # Disallow for everyone as default
+  Order allow,deny
+  <Limit GET PUT LOCK UNLOCK PROPFIND HEAD OPTIONS>
+      Allow from all
+  </Limit>
+  #DavMinTimeout 600
+</Directory>
+
+# 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"
+
+
+# Pull in kolab-webadmin configuration
+Include /etc/kolab/kolab-webadmin-apache*.conf
+
+</VirtualHost>                                  


Property changes on: kolabd/branches/2.2.1/debian/apache.conf
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-17 15:47:44 UTC (rev 1080)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-17 16:05:43 UTC (rev 1081)
@@ -24,8 +24,9 @@
     - replaces kolab-{freebusy,filter} by php-kolab-{freebusy,filter} in
       depends 
     - suggests clamav, clamav-daemon, spamassassin 
+  * taken apache.conf from kolab-freebusy 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 16:41:10 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 16:59:00 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/control
===================================================================
--- kolabd/branches/2.2.1/debian/control	2008-12-17 15:47:44 UTC (rev 1080)
+++ kolabd/branches/2.2.1/debian/control	2008-12-17 16:05:43 UTC (rev 1081)
@@ -20,6 +20,8 @@
  adduser, lsb-base (>= 3.0-3)
 Recommends: slapd, ldap-utils
 Suggests: openssl, db4.2-util, kolab-webadmin, amavisd-new, clamav, clamav-daemon, spamassassin
+Replaces: kolab-freebusy (<<2.2.1)
+Conflicts: kolab-freebusy (<<2.2.1)
 Description: groupware server
  Kolab is a secure, scalable, and reliable groupware server.  It consists
  of a number of well-known and proven components for the standard tasks

Modified: kolabd/branches/2.2.1/debian/rules
===================================================================
--- kolabd/branches/2.2.1/debian/rules	2008-12-17 15:47:44 UTC (rev 1080)
+++ kolabd/branches/2.2.1/debian/rules	2008-12-17 16:05:43 UTC (rev 1081)
@@ -43,11 +43,14 @@
 	for i in templates/*.template ; do install -D -m 644 $$i debian/kolabd/etc/kolab/$$i ; done
 	rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* cyrus.* freshclam.* httpd.* session_vars.* local.cf.template)
 
-	# LDAP files
+	# LDAP schemas
 	install -D -m 644 debian/rfc2739.schema debian/kolabd/etc/ldap/schema/rfc2739.schema
 	install -D -m 644 horde.schema debian/kolabd/etc/ldap/schema/horde.schema
 	install -D -m 644 kolab2.schema debian/kolabd/etc/ldap/schema/kolab2.schema
 
+	#apache config
+	install -D -m 644 debian/apache.conf debian/kolab-freebusy/etc/kolab/apache.conf
+
 #	# Commented out because of copyright issues, needs further investigation
 #	install -D -m 644 rfc2739.schema debian/kolabd/usr/share/kolabd/schema/rfc2739.schema