diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 313f1ab07..caa4141ff 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -68,6 +68,18 @@ # apache::vhost ssl parameters. # Optional. 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 opportunity to add custom process options or to # overwrite the default options for the WSGI main process. @@ -103,6 +115,9 @@ class neutron::wsgi::apache ( $wsgi_process_display_name = undef, $threads = 1, $priority = '10', + $access_log_file = false, + $access_log_format = false, + $error_log_file = undef, $custom_wsgi_process_options = {}, ) { @@ -159,5 +174,8 @@ class neutron::wsgi::apache ( wsgi_script_file => 'app', wsgi_script_source => $::neutron::params::neutron_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/neutron_wsgi_apache_spec.rb b/spec/classes/neutron_wsgi_apache_spec.rb index 1edc4c376..f785d2d11 100644 --- a/spec/classes/neutron_wsgi_apache_spec.rb +++ b/spec/classes/neutron_wsgi_apache_spec.rb @@ -23,6 +23,8 @@ describe 'neutron::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 @@ -38,6 +40,9 @@ describe 'neutron::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('neutron::params') } @@ -63,6 +68,9 @@ describe 'neutron::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