diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 91ab95b..22cb3f1 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -56,6 +56,14 @@ # The log file name for the virtualhost. # Optional. Defaults to undef. # +# [*access_log_pipe*] +# Specifies a pipe where Apache sends access logs for the virtualhost. +# Optional. Defaults to undef. +# +# [*access_log_syslog*] +# Sends the virtualhost access log messages to syslog. +# Optional. Defaults to undef. +# # [*access_log_format*] # The log format for the virtualhost. # Optional. Defaults to undef. @@ -64,6 +72,14 @@ # The error log file name for the virtualhost. # Optional. Defaults to undef. # +# [*error_log_pipe*] +# Specifies a pipe where Apache sends error logs for the virtualhost. +# Optional. Defaults to undef. +# +# [*error_log_syslog*] +# Sends the virtualhost error log messages to syslog. +# Optional. Defaults to undef. +# # [*wsgi_process_display_name*] # (optional) Name of the WSGI process display-name. # Defaults to undef @@ -122,8 +138,12 @@ class watcher::wsgi::apache ( $threads = 1, $priority = 10, $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, $custom_wsgi_process_options = {}, $headers = undef, $request_headers = undef, @@ -160,9 +180,13 @@ class watcher::wsgi::apache ( wsgi_script_source => $::watcher::params::watcher_wsgi_script_source, headers => $headers, request_headers => $request_headers, + custom_wsgi_process_options => $custom_wsgi_process_options, access_log_file => $access_log_file, + access_log_pipe => $access_log_pipe, + access_log_syslog => $access_log_syslog, access_log_format => $access_log_format, error_log_file => $error_log_file, - custom_wsgi_process_options => $custom_wsgi_process_options, + error_log_pipe => $error_log_pipe, + error_log_syslog => $error_log_syslog, } } diff --git a/releasenotes/notes/httpd-logs-piped-syslog-bab044bf788d548d.yaml b/releasenotes/notes/httpd-logs-piped-syslog-bab044bf788d548d.yaml new file mode 100644 index 0000000..07cadc9 --- /dev/null +++ b/releasenotes/notes/httpd-logs-piped-syslog-bab044bf788d548d.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Added parameters for advanced configuration of httpd access and error log + destinations including piped logging and syslog (see `mod_syslog`). Note + that mod_syslog requires Apache2 >= 2.5.0. diff --git a/spec/classes/watcher_wsgi_apache_spec.rb b/spec/classes/watcher_wsgi_apache_spec.rb index 3946022..8b8f49f 100644 --- a/spec/classes/watcher_wsgi_apache_spec.rb +++ b/spec/classes/watcher_wsgi_apache_spec.rb @@ -22,9 +22,14 @@ describe 'watcher::wsgi::apache' do :wsgi_script_source => platform_params[:wsgi_script_source], :headers => nil, :request_headers => nil, - :access_log_file => nil, - :access_log_format => nil, :custom_wsgi_process_options => {}, + :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, )} end @@ -37,9 +42,6 @@ describe 'watcher::wsgi::apache' do :ssl => true, :wsgi_process_display_name => 'watcher', :workers => 37, - :access_log_file => '/var/log/httpd/access_log', - :access_log_format => 'some format', - :error_log_file => '/var/log/httpd/error_log', :custom_wsgi_process_options => { 'python_path' => '/my/python/path', }, @@ -66,14 +68,75 @@ describe 'watcher::wsgi::apache' do :wsgi_script_source => platform_params[:wsgi_script_source], :headers => ['set X-XSS-Protection "1; mode=block"'], :request_headers => ['set Content-Type "application/json"'], - :access_log_file => '/var/log/httpd/access_log', - :access_log_format => 'some format', - :error_log_file => '/var/log/httpd/error_log', :custom_wsgi_process_options => { 'python_path' => '/my/python/path', }, )} end + + context 'with custom access logging' do + let :params do + { + :access_log_format => 'foo', + :access_log_syslog => 'syslog:local0', + :error_log_syslog => 'syslog:local1', + } + end + + it { should contain_openstacklib__wsgi__apache('watcher_wsgi').with( + :access_log_format => params[:access_log_format], + :access_log_syslog => params[:access_log_syslog], + :error_log_syslog => params[:error_log_syslog], + )} + end + + context 'with access_log_file' do + let :params do + { + :access_log_file => '/path/to/file', + } + end + + it { should contain_openstacklib__wsgi__apache('watcher_wsgi').with( + :access_log_file => params[:access_log_file], + )} + end + + context 'with access_log_pipe' do + let :params do + { + :access_log_pipe => 'pipe', + } + end + + it { should contain_openstacklib__wsgi__apache('watcher_wsgi').with( + :access_log_pipe => params[:access_log_pipe], + )} + end + + context 'with error_log_file' do + let :params do + { + :error_log_file => '/path/to/file', + } + end + + it { should contain_openstacklib__wsgi__apache('watcher_wsgi').with( + :error_log_file => params[:error_log_file], + )} + end + + context 'with error_log_pipe' do + let :params do + { + :error_log_pipe => 'pipe', + } + end + + it { should contain_openstacklib__wsgi__apache('watcher_wsgi').with( + :error_log_pipe => params[:error_log_pipe], + )} + end end on_supported_os({