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

Peter Eisentraut petere at alioth.debian.org
Sat Nov 4 14:40:33 CET 2006


Author: petere
Date: 2006-11-04 14:40:33 +0100 (Sat, 04 Nov 2006)
New Revision: 510

Modified:
   kolab-resource-handlers/trunk/debian/apache.conf
Log:
Clean up formatting for apache.conf

Modified: kolab-resource-handlers/trunk/debian/apache.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache.conf	2006-11-04 10:39:59 UTC (rev 509)
+++ kolab-resource-handlers/trunk/debian/apache.conf	2006-11-04 13:40:33 UTC (rev 510)
@@ -1,51 +1,49 @@
 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
+	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>
 
-	#Change this for your documentroot directory
 	DocumentRoot "/var/www"
-	
-	#Change servername
-	ServerName example.com:443
 
-	#Your mail adress for problems ;)
+	# Change servername
+	ServerName kolabserver.example.com:443
+
+	# Contact email address 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
+
+	# 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 your certificate
+	# Path to server certificate
 	SSLCertificateFile /etc/apache2/ssl/apache.pem
-	
+
 	<Files ~ "\.(cgi|shtml|phtml|php3?)$">
 		SSLOptions +StdEnvVars
 	</Files>
-	
-	#Special IE options
+
+	# Special IE options
 	SetEnvIf User-Agent ".*MSIE.*" \
 	         nokeepalive ssl-unclean-shutdown \
 	         downgrade-1.0 force-response-1.0




More information about the pkg-kolab-devel mailing list