Merge "Adapt to new type validation in puppetlabs-apache"
This commit is contained in:
commit
c0c885422d
|
@ -64,7 +64,7 @@
|
|||
#
|
||||
# [*priority*]
|
||||
# (Optional) The priority for the vhost.
|
||||
# Defaults to '10'
|
||||
# Defaults to 10
|
||||
#
|
||||
# [*threads*]
|
||||
# (Optional) The number of threads for the vhost.
|
||||
|
@ -94,19 +94,19 @@
|
|||
#
|
||||
# [*access_log_file*]
|
||||
# (Optional) The log file name for the virtualhost.
|
||||
# Defaults to false
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*access_log_pipe*]
|
||||
# (Optional) Specifies a pipe where Apache sends access logs for the virtualhost.
|
||||
# Defaults to false
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*access_log_syslog*]
|
||||
# (Optional) Sends the virtualhost access log messages to syslog.
|
||||
# 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.
|
||||
|
@ -157,10 +157,10 @@ class keystone::wsgi::apache (
|
|||
$wsgi_pass_authorization = 'On',
|
||||
$wsgi_chunked_request = undef,
|
||||
$wsgi_script_source = '/usr/bin/keystone-wsgi-public',
|
||||
$access_log_file = false,
|
||||
$access_log_pipe = false,
|
||||
$access_log_syslog = false,
|
||||
$access_log_format = false,
|
||||
$access_log_file = undef,
|
||||
$access_log_pipe = undef,
|
||||
$access_log_syslog = undef,
|
||||
$access_log_format = undef,
|
||||
$error_log_file = undef,
|
||||
$error_log_pipe = undef,
|
||||
$error_log_syslog = undef,
|
||||
|
|
|
@ -23,7 +23,7 @@ describe 'keystone::wsgi::apache' do
|
|||
:workers => facts[:os_workers_keystone],
|
||||
:threads => 1,
|
||||
:user => 'keystone',
|
||||
:priority => '10',
|
||||
:priority => 10,
|
||||
:ssl => false,
|
||||
:wsgi_daemon_process => 'keystone',
|
||||
:wsgi_process_display_name => 'keystone',
|
||||
|
@ -36,10 +36,10 @@ describe 'keystone::wsgi::apache' do
|
|||
:headers => nil,
|
||||
:request_headers => nil,
|
||||
:custom_wsgi_process_options => {},
|
||||
:access_log_file => false,
|
||||
:access_log_pipe => false,
|
||||
:access_log_syslog => false,
|
||||
:access_log_format => false,
|
||||
:access_log_file => nil,
|
||||
:access_log_pipe => nil,
|
||||
:access_log_syslog => nil,
|
||||
:access_log_format => nil,
|
||||
:error_log_file => nil,
|
||||
:error_log_pipe => nil,
|
||||
:error_log_syslog => nil,
|
||||
|
@ -63,7 +63,7 @@ describe 'keystone::wsgi::apache' do
|
|||
:ssl_crl => 'crl',
|
||||
:ssl_certs_dir => '/etc/ssl/certs',
|
||||
:threads => 10,
|
||||
:priority => '20',
|
||||
:priority => 20,
|
||||
:wsgi_application_group => 'group',
|
||||
:wsgi_pass_authorization => 'Off',
|
||||
:wsgi_chunked_request => 'On',
|
||||
|
|
Loading…
Reference in New Issue