From d262e03ec9d2c7db02b9ed67ba89a9640fbbe831 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Tue, 10 Oct 2017 08:06:52 +0300
Subject: [PATCH] Allow setting log files for apache vhost

This allows the setting of the error and access file logs, as well as
the access log format. This was done in a similar fashion as one can
configure these ones in the keystone wsgi manifest.

Change-Id: I0e42e5edacc10060c2906f21fd907845cda203a4
---
 manifests/wsgi/apache.pp              | 19 +++++++++++++++++++
 spec/classes/aodh_wsgi_apache_spec.rb |  8 ++++++++
 2 files changed, 27 insertions(+)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index f6818f90..ab251775 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -69,6 +69,19 @@
 #   [*ssl_certs_dir*]
 #     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.
@@ -105,6 +118,9 @@ class aodh::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 = {},
 ) {
 
@@ -145,5 +161,8 @@ class aodh::wsgi::apache (
     wsgi_script_file            => 'app',
     wsgi_script_source          => $::aodh::params::aodh_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/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb
index 0d4c6181..561bc205 100644
--- a/spec/classes/aodh_wsgi_apache_spec.rb
+++ b/spec/classes/aodh_wsgi_apache_spec.rb
@@ -23,6 +23,8 @@ describe 'aodh::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 'aodh::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('aodh::params') }
@@ -63,6 +68,9 @@ describe 'aodh::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