opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Allow removal of gzip_types from the config
This commit is contained in:
Matthew Haughton 2016-02-15 10:06:05 -05:00
commit a674c8d5ce
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/config.pp
View file

@ -60,7 +60,7 @@ class nginx::config(
$gzip_min_length = 20, $gzip_min_length = 20,
$gzip_http_version = 1.1, $gzip_http_version = 1.1,
$gzip_proxied = 'off', $gzip_proxied = 'off',
$gzip_types = 'text/html', $gzip_types = undef,
$gzip_vary = 'off', $gzip_vary = 'off',
$http_cfg_append = false, $http_cfg_append = false,
$http_tcp_nodelay = 'on', $http_tcp_nodelay = 'on',

2
templates/conf.d/nginx.conf.erb
View file

@ -74,7 +74,9 @@ http {
<% if @gzip_proxied -%> <% if @gzip_proxied -%>
gzip_proxied <%= @gzip_proxied %>; gzip_proxied <%= @gzip_proxied %>;
<% end -%> <% end -%>
<% if @gzip_types -%>
gzip_types <%= @gzip_types.kind_of?(Array) ? @gzip_types.join(' ') : @gzip_types %>; gzip_types <%= @gzip_types.kind_of?(Array) ? @gzip_types.join(' ') : @gzip_types %>;
<% end -%>
gzip_vary <%= @gzip_vary %>; gzip_vary <%= @gzip_vary %>;
<% end -%> <% end -%>