Introduce node[:apache][:deflate_types] attribute.

Move mime-types for which mod_deflate is active into attribute file. This allows the user to customize these types. In addition this also aligns NGinx and Apache cookbooks.
sasankh · Jan 3, 2014 · 1cff05f · 1cff05f
1 parent ca37994
commit 1cff05f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/apache2/attributes/apache.rb b/apache2/attributes/apache.rb
@@ -63,6 +63,17 @@
 default[:apache][:keepalive] = 'Off'
 default[:apache][:keepaliverequests] = 100
 default[:apache][:keepalivetimeout] = 3
+default[:apache][:deflate_types] = ['application/javascript',
+                                    'application/json',
+                                    'application/x-javascript',
+                                    'application/xhtml+xml',
+                                    'application/xml',
+                                    'application/xml+rss',
+                                    'text/css',
+                                    'text/html',
+                                    'text/javascript',
+                                    'text/plain',
+                                    'text/xml']
 
 # Security
 default[:apache][:servertokens] = 'Prod'

diff --git a/apache2/templates/default/mods/deflate.conf.erb b/apache2/templates/default/mods/deflate.conf.erb
@@ -1,3 +1,3 @@
 <IfModule mod_deflate.c>
-          AddOutputFilterByType DEFLATE application/javascript application/json application/x-javascript application/xhtml+xml application/xml application/xml+rss text/css text/html text/javascript text/plain text/xml
+          AddOutputFilterByType DEFLATE <%= node[:apache][:deflate_types].join(' ') %>;
 </IfModule>