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

[Peter Eisentraut]

Author: petere
Date: 2006-10-28 12:19:33 +0200 (Sat, 28 Oct 2006)
New Revision: 484

Added:
   kolab-resource-handlers/trunk/debian/apache.conf
Removed:
   kolab-resource-handlers/trunk/debian/apache2-kolab.conf
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/links
   kolab-resource-handlers/trunk/debian/postinst
   kolab-resource-handlers/trunk/debian/rules
Log:
* Renamed Apache configuration file to /etc/kolab/apache.conf, in line
  with most other Debian packages

Copied: kolab-resource-handlers/trunk/debian/apache.conf (from rev 483, kolab-resource-handlers/trunk/debian/apache2-kolab.conf)

Deleted: kolab-resource-handlers/trunk/debian/apache2-kolab.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache2-kolab.conf	2006-10-28 09:54:16 UTC (rev 483)
+++ kolab-resource-handlers/trunk/debian/apache2-kolab.conf	2006-10-28 10:19:33 UTC (rev 484)
@@ -1,57 +0,0 @@
-NameVirtualHost *:443
-<VirtualHost *:443>
-        
-	# FreeBusy list rewrite rules
-        RewriteEngine On
-        #RewriteLog "/tmp/rewrite.log"
-        #RewriteLogLevel 9
-        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>
-
-	#Change this for your documentroot directory
-	DocumentRoot "/var/www"
-	
-	#Change servername
-	ServerName example.com:443
-
-	#Your mail adress for problems ;)
-	ServerAdmin root at example.com
-	
-	#Special logs
-	ErrorLog /var/log/apache2/ssl_error.log
-	TransferLog /var/log/apache2/ssl_access.log
-	CustomLog /var/log/apache2/ssl_requestr.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 your 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 if installed
-	Include /etc/kolab-webadmin/apache*.conf
-
-</VirtualHost>                                  

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2006-10-28 09:54:16 UTC (rev 483)
+++ kolab-resource-handlers/trunk/debian/changelog	2006-10-28 10:19:33 UTC (rev 484)
@@ -5,6 +5,8 @@
   * Added XS-X-Vcs-Svn field
   * Restricted permissions on configuration files containing passwords
   * Create default SSL certificate on package installation
+  * Renamed Apache configuration file to /etc/kolab/apache.conf, in line
+    with most other Debian packages
 
  -- Peter Eisentraut <petere at debian.org>  Wed, 25 Oct 2006 23:24:49 +0200
 

Modified: kolab-resource-handlers/trunk/debian/links
===================================================================
--- kolab-resource-handlers/trunk/debian/links	2006-10-28 09:54:16 UTC (rev 483)
+++ kolab-resource-handlers/trunk/debian/links	2006-10-28 10:19:33 UTC (rev 484)
@@ -1 +1 @@
-etc/kolab/apache2-kolab.conf etc/apache2/sites-available/kolab
+etc/kolab/apache.conf etc/apache2/sites-available/kolab

Modified: kolab-resource-handlers/trunk/debian/postinst
===================================================================
--- kolab-resource-handlers/trunk/debian/postinst	2006-10-28 09:54:16 UTC (rev 483)
+++ kolab-resource-handlers/trunk/debian/postinst	2006-10-28 10:19:33 UTC (rev 484)
@@ -12,7 +12,7 @@
 }
 
 setup_cert() {
-	cert_file=$(sed -n -r 's/^[[:space:]]*SSLCertificateFile[[:space:]]+([^[:space:]]+)$/\1/p' /etc/kolab/apache2-kolab.conf)
+	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"

Modified: kolab-resource-handlers/trunk/debian/rules
===================================================================
--- kolab-resource-handlers/trunk/debian/rules	2006-10-28 09:54:16 UTC (rev 483)
+++ kolab-resource-handlers/trunk/debian/rules	2006-10-28 10:19:33 UTC (rev 484)
@@ -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/apache2-kolab.conf debian/kolab-resource-handlers/etc/kolab/apache2-kolab.conf
+	install -D -m 644 debian/apache.conf debian/kolab-resource-handlers/etc/kolab/apache.conf
 	
 binary-indep: build install
 	dh_testdir