Merge pull request voxpupuli#765 from jfryman/3flex/fix-748

Allow removal of gzip_types from the config
Slm0n87 · Feb 15, 2016 · 10056b8 · 10056b8
2 parents d2496ce + 0ad6bc7
commit 10056b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -60,7 +60,7 @@
   $gzip_min_length                = 20,
   $gzip_http_version              = 1.1,
   $gzip_proxied                   = 'off',
-  $gzip_types                     = 'text/html',
+  $gzip_types                     = undef,
   $gzip_vary                      = 'off',
   $http_cfg_append                = false,
   $http_tcp_nodelay               = 'on',

diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
@@ -74,7 +74,9 @@ http {
 <% if @gzip_proxied -%>
   gzip_proxied      <%= @gzip_proxied %>;
 <% end -%>
+<% if @gzip_types -%>
   gzip_types        <%= @gzip_types.kind_of?(Array) ? @gzip_types.join(' ') : @gzip_types %>;
+<% end -%>
   gzip_vary         <%= @gzip_vary %>;
 <% end -%>