apache: Add support for RequestHeader statements
This change introduces the new parameter to override the apache::vhost::request_headers parameter, which is used to define RequestHeader statements in vhost configuration. Change-Id: I360b18acdf974bf3cdc9f8e817b66cd85f116afd
This commit is contained in:
parent
3d397fc10c
commit
e61fb1e4e2
@ -166,6 +166,10 @@
|
|||||||
# (Optional) Headers for the vhost.
|
# (Optional) Headers for the vhost.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
|
# [*request_headers*]
|
||||||
|
# (Optional) Modifies collected request headers in various ways.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
# [*aliases*]
|
# [*aliases*]
|
||||||
# (Optional) Aliases for the vhost.
|
# (Optional) Aliases for the vhost.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
@ -262,6 +266,7 @@ define openstacklib::wsgi::apache (
|
|||||||
$wsgi_import_script = undef,
|
$wsgi_import_script = undef,
|
||||||
$wsgi_import_script_options = undef,
|
$wsgi_import_script_options = undef,
|
||||||
$headers = undef,
|
$headers = undef,
|
||||||
|
$request_headers = undef,
|
||||||
$aliases = undef,
|
$aliases = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
$custom_wsgi_script_aliases = undef,
|
$custom_wsgi_script_aliases = undef,
|
||||||
@ -373,6 +378,7 @@ define openstacklib::wsgi::apache (
|
|||||||
wsgi_import_script => $wsgi_import_script_real,
|
wsgi_import_script => $wsgi_import_script_real,
|
||||||
wsgi_import_script_options => $wsgi_import_script_options_real,
|
wsgi_import_script_options => $wsgi_import_script_options_real,
|
||||||
headers => $headers,
|
headers => $headers,
|
||||||
|
request_headers => $request_headers,
|
||||||
aliases => $aliases,
|
aliases => $aliases,
|
||||||
custom_fragment => $vhost_custom_fragment,
|
custom_fragment => $vhost_custom_fragment,
|
||||||
allow_encoded_slashes => $allow_encoded_slashes,
|
allow_encoded_slashes => $allow_encoded_slashes,
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``openstacklib::wsgi::apache::request_headers`` parameter has been
|
||||||
|
added.
|
@ -90,6 +90,7 @@ describe 'openstacklib::wsgi::apache' do
|
|||||||
:wsgi_script_aliases => { '/' => "/var/www/cgi-bin/keystone/main" },
|
:wsgi_script_aliases => { '/' => "/var/www/cgi-bin/keystone/main" },
|
||||||
:wsgi_application_group => '%{GLOBAL}',
|
:wsgi_application_group => '%{GLOBAL}',
|
||||||
:headers => nil,
|
:headers => nil,
|
||||||
|
:request_headers => nil,
|
||||||
:aliases => nil,
|
:aliases => nil,
|
||||||
:setenvif => ['X-Forwarded-Proto https HTTPS=1'],
|
:setenvif => ['X-Forwarded-Proto https HTTPS=1'],
|
||||||
:access_log_file => false,
|
:access_log_file => false,
|
||||||
@ -115,6 +116,7 @@ describe 'openstacklib::wsgi::apache' do
|
|||||||
:wsgi_chunked_request => 'On',
|
:wsgi_chunked_request => 'On',
|
||||||
:custom_wsgi_script_aliases => { '/admin' => '/var/www/cgi-bin/keystone/admin' },
|
:custom_wsgi_script_aliases => { '/admin' => '/var/www/cgi-bin/keystone/admin' },
|
||||||
:headers => 'set X-Frame-Options "DENY"',
|
:headers => 'set X-Frame-Options "DENY"',
|
||||||
|
:request_headers => 'set Content-Type "application/json"',
|
||||||
:aliases => [
|
:aliases => [
|
||||||
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', },
|
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', },
|
||||||
],
|
],
|
||||||
@ -160,6 +162,7 @@ describe 'openstacklib::wsgi::apache' do
|
|||||||
:wsgi_pass_authorization => 'On',
|
:wsgi_pass_authorization => 'On',
|
||||||
:wsgi_chunked_request => 'On',
|
:wsgi_chunked_request => 'On',
|
||||||
:headers => 'set X-Frame-Options "DENY"',
|
:headers => 'set X-Frame-Options "DENY"',
|
||||||
|
:request_headers => 'set Content-Type "application/json"',
|
||||||
:aliases => [
|
:aliases => [
|
||||||
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', }
|
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', }
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user