[pkg-kolab] r685 - kolab-resource-handlers/trunk/debian

petere at alioth.debian.org petere at alioth.debian.org
Fri Aug 10 12:47:58 UTC 2007 

Author: petere
Date: 2007-08-10 12:47:58 +0000 (Fri, 10 Aug 2007)
New Revision: 685

Modified:
   kolab-resource-handlers/trunk/debian/apache.conf
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/control
   kolab-resource-handlers/trunk/debian/postinst
Log:
* Dropped SSL certificate setup, now done by kolab_bootstrap
* Updated apache.conf relative to upstream and Debian

Modified: kolab-resource-handlers/trunk/debian/apache.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache.conf	2007-08-10 11:52:51 UTC (rev 684)
+++ kolab-resource-handlers/trunk/debian/apache.conf	2007-08-10 12:47:58 UTC (rev 685)
@@ -1,55 +1,59 @@
 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
+# FreeBusy list handling
+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>
+SSLEngine		on
+SSLCertificateFile	/etc/kolab/cert.pem
+SSLCertificateKeyFile	/etc/kolab/key.pem
 
-	DocumentRoot "/var/www"
+<Files ~ "\.(cgi|shtml|phtml|php4|php3?)$">
+  SSLOptions +StdEnvVars
+</Files>
 
-	# Change servername
-	ServerName kolabserver.example.com:443
+Alias /freebusy /usr/share/kolab-resource-handlers/freebusy
 
-	# Contact email address for problems
-	ServerAdmin root at example.com
+<Location /freebusy>
+	SSLRequireSSL
+</Location>
 
-	# 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"
+# Options for freebusy
+<Directory /usr/share/kolab-resource-handlers/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>
 
-	# 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
+# Change servername
+#ServerName kolabserver.example.com:443
 
-	<Files ~ "\.(cgi|shtml|phtml|php3?)$">
-		SSLOptions +StdEnvVars
-	</Files>
+# Contact email address for problems
+#ServerAdmin root at example.com
 
-	# Special IE options
-	SetEnvIf User-Agent ".*MSIE.*" \
-	         nokeepalive ssl-unclean-shutdown \
-	         downgrade-1.0 force-response-1.0
+# 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
+# Pull in kolab-webadmin configuration
+Include /etc/kolab/kolab-webadmin-apache*.conf
 
 </VirtualHost>                                  

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-10 11:52:51 UTC (rev 684)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-10 12:47:58 UTC (rev 685)
@@ -9,6 +9,8 @@
   * Now using upstream freebusy.conf
   * Added php5 dependency alternatives (closes: #379122, #414038, #424793)
   * Dropped obsolete php4-domxml dependency
+  * Dropped SSL certificate setup, now done by kolab_bootstrap
+  * Updated apache.conf relative to upstream and Debian
 
  -- Peter Eisentraut <petere at debian.org>  Wed, 01 Aug 2007 13:38:31 +0200
 

Modified: kolab-resource-handlers/trunk/debian/control
===================================================================
--- kolab-resource-handlers/trunk/debian/control	2007-08-10 11:52:51 UTC (rev 684)
+++ kolab-resource-handlers/trunk/debian/control	2007-08-10 12:47:58 UTC (rev 685)
@@ -10,7 +10,7 @@
 
 Package: kolab-resource-handlers
 Architecture: all
-Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php5 | libapache2-mod-php4, php5-ldap | php4-ldap, ssl-cert, php5-cli | php4-cli
+Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php5 | libapache2-mod-php4, php5-ldap | php4-ldap, php5-cli | php4-cli
 Description: Kolab free/busy scripts
  This package contains scripts for the free/busy feature of the Kolab
  groupware server.

Modified: kolab-resource-handlers/trunk/debian/postinst
===================================================================
--- kolab-resource-handlers/trunk/debian/postinst	2007-08-10 11:52:51 UTC (rev 684)
+++ kolab-resource-handlers/trunk/debian/postinst	2007-08-10 12:47:58 UTC (rev 685)
@@ -10,14 +10,6 @@
 	chown www-data:root /var/lib/kolab/freebusy-cache/
 }
 
-setup_cert() {
-	cert_file=$(sed -n -r 's/^[[:space:]]*SSLCertificateFile[[:space:]]+([^[:space:]]+)$/\1/p' /etc/kolab/apache.conf)
-	if [ ! -e "$cert_file" ]; then
-		mkdir -p $(dirname $cert_file)
-		make-ssl-cert /usr/share/ssl-cert/ssleay.cnf "$cert_file"
-	fi
-}
-
 configure_apache() {
 	for mod in rewrite ssl ldap; do
 		a2enmod $mod >/dev/null
@@ -40,7 +32,6 @@
 
 if [ "$1" = configure ]; then
 	fixperms
-	setup_cert
 	configure_apache
 fi

More information about the pkg-kolab-devel mailing list