[python-django-horizon/el6-grizzly] fix offline-compression error, enable mod_deflate, mod_expires

[Matthias Runge]

commit 99a5e32f20a0d019053f8483397b694733f37959
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Mar 14 13:22:33 2013 +0100

    fix offline-compression error, enable mod_deflate, mod_expires

 openstack-dashboard.conf   |   22 ++++++++++++++++++++++
 python-django-horizon.spec |    7 ++++++-
 sources                    |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/openstack-dashboard.conf b/openstack-dashboard.conf
index 1bfa48f..67bfbce 100644
--- a/openstack-dashboard.conf
+++ b/openstack-dashboard.conf
@@ -6,6 +6,28 @@ WSGIScriptAlias /dashboard /usr/share/openstack-dashboard/openstack_dashboard/ws
 Alias /static /usr/share/openstack-dashboard/static
 
 <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
+  <IfModule mod_deflate.c>
+    SetOutputFilter DEFLATE
+    <IfModule mod_headers.c>
+      # Make sure proxies don’t deliver the wrong content
+      Header append Vary User-Agent env=!dont-vary
+    </IfModule>
+  </IfModule>
+
   Order allow,deny
   Allow from all
 </Directory>
+
+<Directory /usr/share/openstack-dashboard/static>
+  <IfModule mod_expires.c>
+    ExpiresActive On
+    ExpiresDefault "access 6 month"
+  </IfModule>
+  <IfModule mod_deflate.c>
+    SetOutputFilter DEFLATE
+  </IfModule>
+
+  Order allow,deny
+  Allow from all
+</Directory>
+
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 509cd38..85dee0a 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,6 +1,6 @@
 Name:       python-django-horizon
 Version:    2013.1
-Release:    0.6.g3%{?dist}
+Release:    0.7.g3%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -252,6 +252,11 @@ tar xzf %{SOURCE3}
 %doc html 
 
 %changelog
+* Thu Mar 14 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-0.7.g3
+- fix compressed css (rhbz#921036)
+- enable compression in httpd file
+- set expires in httpd config file
+
 * Fri Mar 08 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-0.6.g3
 - fix a syntax error in config file
 
diff --git a/sources b/sources
index bd5ca5c..4a02bd8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 67145eedcf4e608a8186ac88b9325ffc  horizon-2013.1.g3.tar.gz
-296a1de4ed4365b0d8f12f9d2623422a  python-django-horizon-2013.1-compressed-css.tar.gz
+88dbdc49f9830324c72465692cbb5599  python-django-horizon-2013.1-compressed-css.tar.gz