diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index a5969126..327d4f6d 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -72,6 +72,18 @@ # (Optional) apache::vhost ssl parameters. # Default to apache::vhost 'ssl_*' defaults. # +# [*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. +# # [*custom_wsgi_process_options*] # (optional) gives you the oportunity to add custom process options or to # overwrite the default options for the WSGI main process. @@ -107,6 +119,9 @@ class ceilometer::wsgi::apache ( $wsgi_process_display_name = undef, $threads = $::os_workers, $priority = '10', + $access_log_file = false, + $access_log_format = false, + $error_log_file = undef, $custom_wsgi_process_options = {}, ) { @@ -147,5 +162,8 @@ class ceilometer::wsgi::apache ( wsgi_script_file => 'app', wsgi_script_source => $::ceilometer::params::ceilometer_wsgi_script_source, custom_wsgi_process_options => $custom_wsgi_process_options, + access_log_file => $access_log_file, + access_log_format => $access_log_format, + error_log_file => $error_log_file, } } diff --git a/spec/classes/ceilometer_wsgi_apache_spec.rb b/spec/classes/ceilometer_wsgi_apache_spec.rb index 3de45bea..cb79b378 100644 --- a/spec/classes/ceilometer_wsgi_apache_spec.rb +++ b/spec/classes/ceilometer_wsgi_apache_spec.rb @@ -27,6 +27,8 @@ describe 'ceilometer::wsgi::apache' do :wsgi_script_file => 'app', :wsgi_script_source => platform_params[:wsgi_script_source], :custom_wsgi_process_options => {}, + :access_log_file => false, + :access_log_format => false, )} end @@ -42,6 +44,9 @@ describe 'ceilometer::wsgi::apache' do :custom_wsgi_process_options => { 'python_path' => '/my/python/path', }, + :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('ceilometer::deps') } @@ -68,6 +73,9 @@ describe 'ceilometer::wsgi::apache' do :custom_wsgi_process_options => { 'python_path' => '/my/python/path', }, + :access_log_file => '/var/log/httpd/access_log', + :access_log_format => 'some format', + :error_log_file => '/var/log/httpd/error_log' )} end end