diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 7885ef7..ab9176e 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -66,6 +66,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 oportunity to add custom process options or to # overwrite the default options for the WSGI main process. @@ -101,6 +113,9 @@ class cloudkitty::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 = {}, ) { @@ -137,6 +152,9 @@ class cloudkitty::wsgi::apache ( wsgi_script_file => 'app', wsgi_script_source => $::cloudkitty::params::cloudkitty_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, require => Anchor['cloudkitty::install::end'], } } diff --git a/spec/classes/cloudkitty_wsgi_apache_spec.rb b/spec/classes/cloudkitty_wsgi_apache_spec.rb index 63fde6c..103574c 100644 --- a/spec/classes/cloudkitty_wsgi_apache_spec.rb +++ b/spec/classes/cloudkitty_wsgi_apache_spec.rb @@ -23,6 +23,8 @@ describe 'cloudkitty::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 'cloudkitty::wsgi::apache' do :custom_wsgi_process_options => { 'python_path' => '/my/python/admin/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('cloudkitty::params') } @@ -45,24 +50,27 @@ describe 'cloudkitty::wsgi::apache' do it { is_expected.to contain_class('apache::mod::wsgi') } it { is_expected.to_not contain_class('apache::mod::ssl') } it { is_expected.to contain_openstacklib__wsgi__apache('cloudkitty_wsgi').with( - :bind_host => '10.42.51.1', - :bind_port => 12345, - :group => 'cloudkitty', - :path => '/', - :servername => 'dummy.host', - :ssl => false, - :threads => facts[:os_workers], - :user => 'cloudkitty', - :workers => 37, - :wsgi_daemon_process => 'cloudkitty', - :wsgi_process_display_name => 'cloudkitty', - :wsgi_process_group => 'cloudkitty', - :wsgi_script_dir => platform_params[:wsgi_script_path], - :wsgi_script_file => 'app', - :wsgi_script_source => platform_params[:wsgi_script_source], + :bind_host => '10.42.51.1', + :bind_port => 12345, + :group => 'cloudkitty', + :path => '/', + :servername => 'dummy.host', + :ssl => false, + :threads => facts[:os_workers], + :user => 'cloudkitty', + :workers => 37, + :wsgi_daemon_process => 'cloudkitty', + :wsgi_process_display_name => 'cloudkitty', + :wsgi_process_group => 'cloudkitty', + :wsgi_script_dir => platform_params[:wsgi_script_path], + :wsgi_script_file => 'app', + :wsgi_script_source => platform_params[:wsgi_script_source], :custom_wsgi_process_options => { 'python_path' => '/my/python/admin/path', }, + :access_log_file => '/var/log/httpd/access_log', + :access_log_format => 'some format', + :error_log_file => '/var/log/httpd/error_log' )} end end