[Pkg-voip-commits] r9794 - in /mumble-django/trunk/debian: apache2.conf changelog

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Mon Jun 11 17:16:26 2012
New Revision: 9794

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9794
Log:
Fix apache2.conf to work with mod_deflate and mod_headers enabled.

Modified:
    mumble-django/trunk/debian/apache2.conf
    mumble-django/trunk/debian/changelog

Modified: mumble-django/trunk/debian/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/apache2.conf?rev=9794&op=diff
==============================================================================
--- mumble-django/trunk/debian/apache2.conf (original)
+++ mumble-django/trunk/debian/apache2.conf Mon Jun 11 17:16:26 2012
@@ -7,6 +7,14 @@
 WSGIProcessGroup        mumble-django
 WSGIScriptReloading     Off
 
+<Directory /usr/share/mumble-django/htdocs>
+	<IfModule mod_headers.c>
+		<FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css|swf)$">
+			Header set Cache-Control "max-age=86400, must-revalidate"
+		</FilesMatch>
+	</IfModule>
+</Directory>
+
 <Location /mumble-django>
 	FileETag None
 	<IfModule mod_deflate.c>
@@ -15,10 +23,6 @@
 			# properly handle requests coming from behind proxies
 			Header unset ETag
 			Header append Vary User-Agent
-			<FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css|swf)$">
-				Header set Cache-Control "max-age=86400, must-revalidate"
-			</FilesMatch>
 		</IfModule>
 	</IfModule>
 </Location>
-

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=9794&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Mon Jun 11 17:16:26 2012
@@ -1,3 +1,9 @@
+mumble-django (2.7-4) UNRELEASED; urgency=low
+
+  * Fix apache2.conf to work with mod_deflate and mod_headers enabled.
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 10 Jun 2012 17:49:17 +0200
+
 mumble-django (2.7-3) unstable; urgency=low
 
   [ Patrick Matthäi ]