openstack
/
puppet-barbican
Code Issues Proposed changes

Merge "Allow setting log files for apache vhost"

This commit is contained in:
Jenkins 2017-10-08 16:49:48 +00:00 committed by Gerrit Code Review
parent 9aa994c9a4 7a8801de45
commit 9b1287a9ee
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/wsgi/apache.pp
View File

@ -73,6 +73,18 @@
# (optional) Name of the WSGI process display-name.
# Defaults to undef
#
# [*access_log_file*]
# The log file name for the virtualhost.
# Optional. Defaults to false.
#
# [*access_log_format*]
# The log format for the virtualhost.
# Optional. Defaults to false.
#
# [*error_log_file*]
# The error log file name for the virtualhost.
# Optional. Defaults to undef.
#
# == Dependencies
#
# requires Class['apache'] & Class['barbican']
@ -108,6 +120,9 @@ class barbican::wsgi::apache (
$wsgi_process_display_name = undef,
$threads = $::os_workers,
$priority = '10',
$access_log_file = false,
$access_log_format = false,
$error_log_file = undef,
) {
include ::barbican::deps
@ -162,5 +177,8 @@ class barbican::wsgi::apache (
wsgi_script_dir => $::barbican::params::barbican_wsgi_script_path,
wsgi_script_file => 'main',
wsgi_script_source => $::barbican::params::barbican_wsgi_script_source,
access_log_file => $access_log_file,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
}
}

8
spec/classes/barbican_wsgi_apache_spec.rb
View File

@ -41,6 +41,8 @@ describe 'barbican::wsgi::apache' do
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'main',
:wsgi_script_source => platform_params[:wsgi_script_source],
:access_log_file => false,
:access_log_format => false,
)}
end
@ -53,6 +55,9 @@ describe 'barbican::wsgi::apache' do
:ssl => false,
:wsgi_process_display_name => 'barbican-api',
:workers => 37,
:access_log_file => '/var/log/httpd/access_log',
:access_log_format => 'some format',
:error_log_file => '/var/log/httpd/error_log'
}
end
it { is_expected.to contain_class('barbican::params') }
@ -75,6 +80,9 @@ describe 'barbican::wsgi::apache' do
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'main',
:wsgi_script_source => platform_params[:wsgi_script_source],
:access_log_file => '/var/log/httpd/access_log',
:access_log_format => 'some format',
:error_log_file => '/var/log/httpd/error_log'
)}
end
end