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

Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev

Browse source
This commit is contained in:
Lebedev Vadim 2014-01-21 15:22:19 +04:00
commit 2252d96fe8
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/init.pp
View file

@ -54,6 +54,7 @@ class nginx (
$http_cfg_append = $nginx::params::nx_http_cfg_append,
$nginx_error_log = $nginx::params::nx_nginx_error_log,
$http_access_log = $nginx::params::nx_http_access_log,
$gzip = $nginx::params::nx_gzip,
$nginx_vhosts = {},
$nginx_upstreams = {},
$nginx_locations = {},

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

@ -30,7 +30,7 @@ http {
keepalive_timeout <%= scope.lookupvar('nginx::params::nx_keepalive_timeout')%>;
tcp_nodelay <%= scope.lookupvar('nginx::params::nx_tcp_nodelay')%>;
<% if scope.lookupvar('nginx::params::nx_gzip') == 'on' %>
<% if @gzip == 'on' %>
gzip on;
gzip_disable "MSIE [1-6]\.(?!.*SV1)";
<% end -%>