From 3387346d4beff527a530cd306d23136563e4a06c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 28 May 2014 09:11:59 +0200 Subject: [PATCH 1/2] Make sendfile configurable Conflicts: manifests/init.pp --- manifests/init.pp | 1 + templates/conf.d/nginx.conf.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 28c65d176..57b814d98 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -75,6 +75,7 @@ $proxy_redirect = $nginx::params::nx_proxy_redirect, $proxy_send_timeout = $nginx::params::nx_proxy_send_timeout, $proxy_set_header = $nginx::params::nx_proxy_set_header, + $sendfile = $nginx::params::nx_sendfile, $server_tokens = $nginx::params::nx_server_tokens, $service_ensure = $nginx::params::nx_service_ensure, $service_restart = $nginx::params::nx_service_restart, diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb index 615fcb136..fb492d918 100644 --- a/templates/conf.d/nginx.conf.erb +++ b/templates/conf.d/nginx.conf.erb @@ -23,7 +23,7 @@ http { access_log <%= @http_access_log %>; - sendfile <%= scope.lookupvar('nginx::params::nx_sendfile')%>; + sendfile <%= @sendfile %>; server_tokens <%= @server_tokens %>; From 372b44276e9771dd175d513ae55f0f50e838d95d Mon Sep 17 00:00:00 2001 From: Markus Handschuh Date: Wed, 28 May 2014 09:48:07 +0200 Subject: [PATCH 2/2] Fix sendfile config Conflicts: manifests/config.pp manifests/init.pp --- manifests/config.pp | 1 + manifests/init.pp | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/config.pp b/manifests/config.pp index 52f66fca8..bfab2fe73 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -50,6 +50,7 @@ $proxy_redirect = $nginx::params::nx_proxy_redirect, $proxy_send_timeout = $nginx::params::nx_proxy_send_timeout, $proxy_set_header = $nginx::params::nx_proxy_set_header, + $sendfile = $nginx::params::nx_sendfile, $server_tokens = $nginx::params::nx_server_tokens, $super_user = $nginx::params::nx_super_user, $types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size, diff --git a/manifests/init.pp b/manifests/init.pp index 57b814d98..fbd918f2f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -210,6 +210,7 @@ proxy_redirect => $proxy_redirect, proxy_send_timeout => $proxy_send_timeout, proxy_set_header => $proxy_set_header, + sendfile => $sendfile, server_tokens => $server_tokens, super_user => $super_user, vhost_purge => $vhost_purge,