Merge pull request #467 from invliD/proxy-header-fix

Impossible to set proxy_set_header for default location
voxpupuli · Dec 5, 2014 · ea94229 · ea94229
2 parents 311e504 + 8f79321
commit ea94229
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -493,6 +493,7 @@
       proxy_cache           => $proxy_cache,
       proxy_cache_valid     => $proxy_cache_valid,
       proxy_method          => $proxy_method,
+      proxy_set_header      => $proxy_set_header,
       proxy_set_body        => $proxy_set_body,
       fastcgi               => $fastcgi,
       fastcgi_params        => $fastcgi_params,

diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb
@@ -198,15 +198,6 @@
           :value    => true,
           :notmatch => /  root \/;/,
         },
-        {
-          :title => 'should set proxy_set_header',
-          :attr  => 'proxy_set_header',
-          :value => ['header1','header2'],
-          :match => [
-            '  proxy_set_header        header1;',
-            '  proxy_set_header        header2;',
-          ],
-        },
         {
           :title => 'should rewrite to HTTPS',
           :attr  => 'rewrite_to_https',

diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
@@ -69,9 +69,6 @@ server {
 <% if Array(@resolver).count > 0 -%>
   resolver                  <% Array(@resolver).each do |r| %> <%= r %><% end %>;
 <% end -%>
-<% @proxy_set_header.each do |header| -%>
-  proxy_set_header        <%= header %>;
-<% end -%>
 <% if @add_header -%>
   <%- @add_header.each do |key,value| -%>
   add_header              <%= key %> <%= value %>;

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -116,9 +116,6 @@ server {
 <% Array(@passenger_cgi_param).each do |key,value| -%>
   passenger_set_cgi_param  <%= key %> <%= value %>;
 <% end -%>
-<% Array(@proxy_set_header).each do |header| -%>
-  proxy_set_header        <%= header %>;
-<% end -%>
 <% Array(@add_header).each do |key,value| -%>
   add_header              <%= key %> <%= value %>;
 <% end -%>