Adapt to new type validation in puppetlabs-apache
The puppetlabs-apache module is enforcing more strict data type
validation[1].
This change updates the default values to adapt to that change.
[1] f41251e336
Closes-Bug: #1983300
Depends-on: https://review.opendev.org/851652
Change-Id: I8f865d33ad289b605c27de58d3accf6717888df8
This commit is contained in:
parent
5d4e4e9ff0
commit
4fb0cae9c4
@ -48,7 +48,7 @@
|
||||
#
|
||||
# [*priority*]
|
||||
# (Optional) The priority for the vhost.
|
||||
# Defaults to '10'
|
||||
# Defaults to 10
|
||||
#
|
||||
# [*threads*]
|
||||
# (Optional) The number of threads for the vhost.
|
||||
@ -70,11 +70,11 @@
|
||||
#
|
||||
# [*access_log_file*]
|
||||
# (Optional) The log file name for the virtualhost.
|
||||
# Defaults to false
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*access_log_format*]
|
||||
# (Optional) The log format for the virtualhost.
|
||||
# Defaults to false
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*error_log_file*]
|
||||
# (Optional) The error log file name for the virtualhost.
|
||||
@ -106,7 +106,7 @@ class placement::wsgi::apache (
|
||||
$path = '/',
|
||||
$ssl = false,
|
||||
$workers = $::os_workers,
|
||||
$priority = '10',
|
||||
$priority = 10,
|
||||
$threads = 1,
|
||||
$wsgi_process_display_name = undef,
|
||||
$ssl_cert = undef,
|
||||
@ -116,8 +116,8 @@ class placement::wsgi::apache (
|
||||
$ssl_crl_path = undef,
|
||||
$ssl_crl = undef,
|
||||
$ssl_certs_dir = undef,
|
||||
$access_log_file = false,
|
||||
$access_log_format = false,
|
||||
$access_log_file = undef,
|
||||
$access_log_format = undef,
|
||||
$error_log_file = undef,
|
||||
$headers = undef,
|
||||
$request_headers = undef,
|
||||
|
@ -10,7 +10,7 @@ describe 'placement::wsgi::apache' do
|
||||
:bind_port => 8778,
|
||||
:group => 'placement',
|
||||
:path => '/',
|
||||
:priority => '10',
|
||||
:priority => 10,
|
||||
:servername => facts[:fqdn],
|
||||
:ssl => false,
|
||||
:ssl_ca => nil,
|
||||
@ -30,8 +30,8 @@ describe 'placement::wsgi::apache' do
|
||||
:wsgi_script_source => platform_params[:wsgi_script_source],
|
||||
:headers => nil,
|
||||
:request_headers => nil,
|
||||
:access_log_file => false,
|
||||
:access_log_format => false,
|
||||
:access_log_file => nil,
|
||||
:access_log_format => nil,
|
||||
:error_log_file => nil,
|
||||
)}
|
||||
end
|
||||
@ -55,7 +55,7 @@ describe 'placement::wsgi::apache' do
|
||||
:vhost_custom_fragment => 'Timeout 99',
|
||||
:wsgi_process_display_name => 'custom',
|
||||
:threads => 5,
|
||||
:priority => '25',
|
||||
:priority => 25,
|
||||
:access_log_file => '/var/log/httpd/access_log',
|
||||
:access_log_format => 'some format',
|
||||
:error_log_file => '/var/log/httpd/error_log',
|
||||
|
Loading…
x
Reference in New Issue
Block a user