Merge pull request voxpupuli#282 from genehand/master

Make proxy_redirect configurable
cegeka · Apr 6, 2014 · a62ec20 · a62ec20
2 parents f6cc144 + 59c4d11
commit a62ec20
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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 {
 
   File {

diff --git 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
@@ -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') %>;