Fix proxy_set_header for default location

This commit is contained in:
Sebastian Brückner 2014-09-29 17:48:04 -04:00 committed by Sebastian Brückner
parent 311e50461e
commit 8f793211a5
4 changed files with 1 additions and 15 deletions

View file

@ -493,6 +493,7 @@ define nginx::resource::vhost (
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,

View file

@ -198,15 +198,6 @@ describe 'nginx::resource::vhost' do
: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',

View file

@ -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 %>;

View file

@ -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 -%>