openstack/puppet-openstacklib
Code Issues Proposed changes

apache: Add support for RequestHeader statements

Browse Source 
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:
Takashi Kajinami 2021-12-09 00:05:49 +09:00
parent 3d397fc10c
commit e61fb1e4e2
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/wsgi/apache.pp
View File

@ -166,6 +166,10 @@
# (Optional) Headers for the vhost.
# Defaults to undef
#
# [*request_headers*]
# (Optional) Modifies collected request headers in various ways.
# Defaults to undef
#
# [*aliases*]
# (Optional) Aliases for the vhost.
# Defaults to undef
@ -262,6 +266,7 @@ define openstacklib::wsgi::apache (
$wsgi_import_script = undef,
$wsgi_import_script_options = undef,
$headers = undef,
$request_headers = undef,
$aliases = undef,
$custom_wsgi_process_options = {},
$custom_wsgi_script_aliases = undef,
@ -373,6 +378,7 @@ define openstacklib::wsgi::apache (
wsgi_import_script => $wsgi_import_script_real,
wsgi_import_script_options => $wsgi_import_script_options_real,
headers => $headers,
request_headers => $request_headers,
aliases => $aliases,
custom_fragment => $vhost_custom_fragment,
allow_encoded_slashes => $allow_encoded_slashes,

5
releasenotes/notes/apache-request_headers-1db72ccfd1e76735.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``openstacklib::wsgi::apache::request_headers`` parameter has been
added.

3
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@ -90,6 +90,7 @@ describe 'openstacklib::wsgi::apache' do
:wsgi_script_aliases => { '/' => "/var/www/cgi-bin/keystone/main" },
:wsgi_application_group => '%{GLOBAL}',
:headers => nil,
:request_headers => nil,
:aliases => nil,
:setenvif => ['X-Forwarded-Proto https HTTPS=1'],
:access_log_file => false,
@ -115,6 +116,7 @@ describe 'openstacklib::wsgi::apache' do
:wsgi_chunked_request => 'On',
:custom_wsgi_script_aliases => { '/admin' => '/var/www/cgi-bin/keystone/admin' },
:headers => 'set X-Frame-Options "DENY"',
:request_headers => 'set Content-Type "application/json"',
:aliases => [
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', },
],
@ -160,6 +162,7 @@ describe 'openstacklib::wsgi::apache' do
:wsgi_pass_authorization => 'On',
:wsgi_chunked_request => 'On',
:headers => 'set X-Frame-Options "DENY"',
:request_headers => 'set Content-Type "application/json"',
:aliases => [
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', }
],