openstack/puppet-panko
Code Issues Proposed changes

Remove explicit log file for panko

Browse Source 
This is causing selinux issues as the context
for apache doesnt match. Let apache create
app.log by default instead.

Change-Id: I670c88f6b1bcfcb5d5d6e14ad8e1ab936b417460
This commit is contained in:
Pradeep Kilambi 2017-03-29 11:27:25 -04:00
parent e9922a82a7
commit 5db76aae39
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/logging.pp
View File

@ -27,7 +27,7 @@
# #
# [*log_file*] # [*log_file*]
# (optional) File where logs should be stored. # (optional) File where logs should be stored.
# Defaults to '/var/log/panko/panko.log' # Defaults to $::os_service_default
# #
# [*logging_context_format_string*] # [*logging_context_format_string*]
# (optional) Format string to use for log messages with context. # (optional) Format string to use for log messages with context.
@ -98,7 +98,7 @@ class panko::logging(
$use_stderr = $::os_service_default, $use_stderr = $::os_service_default,
$syslog_log_facility = $::os_service_default, $syslog_log_facility = $::os_service_default,
$log_dir = '/var/log/panko', $log_dir = '/var/log/panko',
$log_file = '/var/log/panko/panko.log', $log_file = $::os_service_default,
$debug = $::os_service_default, $debug = $::os_service_default,
$logging_context_format_string = $::os_service_default, $logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default, $logging_default_format_string = $::os_service_default,

5
releasenotes/notes/remove-explicit-log-e931f303c9bf7946.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Remove explcit panko.log file as this messes up the selinux context.
When apache writes to it it complains. Instead let apache create
the app.log on its own so the context are correct.

2
spec/classes/panko_logging_spec.rb
View File

@ -61,7 +61,7 @@ describe 'panko::logging' do
is_expected.to contain_panko_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_panko_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_panko_config('DEFAULT/syslog_log_facility').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_panko_config('DEFAULT/syslog_log_facility').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_panko_config('DEFAULT/log_dir').with(:value => '/var/log/panko') is_expected.to contain_panko_config('DEFAULT/log_dir').with(:value => '/var/log/panko')
is_expected.to contain_panko_config('DEFAULT/log_file').with(:value => '/var/log/panko/panko.log') is_expected.to contain_panko_config('DEFAULT/log_file').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_panko_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_panko_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
end end
end end