openstack/puppet-openstacklib
Code Issues Proposed changes

Add support for setenv parameter in apache

Browse Source 
Change-Id: I0ac20540603d9682354b90f06a852a53d74767e3
This commit is contained in:
Takashi Kajinami
2020-09-06 23:37:13 +09:00
parent a7908b4bc4
commit 10af7893ed
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/wsgi/apache.pp
View File

@@ -51,6 +51,10 @@
# (Optional) The priority for the vhost. # (Optional) The priority for the vhost.
# Defaults to '10' # Defaults to '10'
# #
# [*setenv*]
# (Optional) Set environment variables for the vhost.
# Defaults to []
#
# [*ssl*] # [*ssl*]
# (Optional) Use SSL. # (Optional) Use SSL.
# Defaults to false # Defaults to false
@@ -217,12 +221,13 @@
# #
define openstacklib::wsgi::apache ( define openstacklib::wsgi::apache (
$service_name = $name, $service_name = $name,
$servername = $::fqdn,
$bind_host = undef, $bind_host = undef,
$bind_port = undef, $bind_port = undef,
$group = undef, $group = undef,
$path = '/', $path = '/',
$priority = '10', $priority = '10',
$servername = $::fqdn, $setenv = [],
$ssl = false, $ssl = false,
$ssl_ca = undef, $ssl_ca = undef,
$ssl_cert = undef, $ssl_cert = undef,
@@ -337,6 +342,7 @@ define openstacklib::wsgi::apache (
docroot_owner => $user, docroot_owner => $user,
docroot_group => $group, docroot_group => $group,
priority => $priority, priority => $priority,
setenv => $setenv,
setenvif => ['X-Forwarded-Proto https HTTPS=1'], setenvif => ['X-Forwarded-Proto https HTTPS=1'],
ssl => $ssl, ssl => $ssl,
ssl_cert => $ssl_cert, ssl_cert => $ssl_cert,

6
releasenotes/notes/wsgi-setenv-8e8519fdb96d98b0.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
features:
- |
The new ``openstacklib::wsgi::apache::setenv`` parameter has been added.
This paramaeter can be to define environment variables for vhost, passed
by httpd.

3
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@@ -74,6 +74,7 @@ describe 'openstacklib::wsgi::apache' do
:docroot => '/var/www/cgi-bin/keystone', :docroot => '/var/www/cgi-bin/keystone',
:docroot_owner => 'keystone', :docroot_owner => 'keystone',
:docroot_group => 'keystone', :docroot_group => 'keystone',
:setenv => [],
:ssl => 'true', :ssl => 'true',
:wsgi_daemon_process => { :wsgi_daemon_process => {
'keystone_wsgi' => { 'keystone_wsgi' => {
@@ -116,6 +117,7 @@ describe 'openstacklib::wsgi::apache' do
:bind_port => 4142, :bind_port => 4142,
:user => 'keystone', :user => 'keystone',
:group => 'keystone', :group => 'keystone',
:setenv => ['MYENV foo'],
:ssl => false, :ssl => false,
:workers => 37, :workers => 37,
:vhost_custom_fragment => 'LimitRequestFieldSize 81900', :vhost_custom_fragment => 'LimitRequestFieldSize 81900',
@@ -133,6 +135,7 @@ describe 'openstacklib::wsgi::apache' do
:ip => '10.42.51.1', :ip => '10.42.51.1',
:port => '4142', :port => '4142',
:docroot => "/var/www/cgi-bin/keystone", :docroot => "/var/www/cgi-bin/keystone",
:setenv => ['MYENV foo'],
:ssl => 'false', :ssl => 'false',
:wsgi_daemon_process => { :wsgi_daemon_process => {
'keystone_wsgi' => { 'keystone_wsgi' => {