From ea6129bf9883346625a8f5e0d1e42a39f9d7ad82 Mon Sep 17 00:00:00 2001 From: Gene Hand Date: Thu, 27 Mar 2014 13:55:11 -0700 Subject: [PATCH] Make proxy_redirect configurable --- manifests/config.pp | 1 + manifests/init.pp | 2 ++ templates/conf.d/proxy.conf.erb | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index 89d75d27b..99c64be75 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -40,6 +40,7 @@ $gzip = $nginx::params::nx_gzip, $conf_template = $nginx::params::nx_conf_template, $proxy_conf_template = $nginx::params::nx_proxy_conf_template, + $proxy_redirect = $nginx::params::nx_proxy_redirect, ) inherits nginx::params { if $caller_module_name != $module_name { diff --git a/manifests/init.pp b/manifests/init.pp index 9ed416903..2763a91be 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -60,6 +60,7 @@ $gzip = $nginx::params::nx_gzip, $conf_template = $nginx::params::nx_conf_template, $proxy_conf_template = $nginx::params::nx_proxy_conf_template, + $proxy_redirect = $nginx::params::nx_proxy_redirect, $nginx_vhosts = {}, $nginx_upstreams = {}, $nginx_locations = {}, @@ -149,6 +150,7 @@ gzip => $gzip, conf_template => $conf_template, proxy_conf_template => $proxy_conf_template, + proxy_redirect => $proxy_redirect, require => Class['nginx::package'], notify => Class['nginx::service'], } diff --git a/templates/conf.d/proxy.conf.erb b/templates/conf.d/proxy.conf.erb index fcd7e1d5b..7ed19d536 100644 --- a/templates/conf.d/proxy.conf.erb +++ b/templates/conf.d/proxy.conf.erb @@ -1,4 +1,4 @@ -proxy_redirect <%= scope.lookupvar('nginx::params::nx_proxy_redirect') %>; +proxy_redirect <%= @proxy_redirect %>; client_max_body_size <%= @client_max_body_size %>; client_body_buffer_size <%= scope.lookupvar('nginx::params::nx_client_body_buffer_size') %>; proxy_connect_timeout <%= scope.lookupvar('nginx::params::nx_proxy_connect_timeout') %>;