Commit cd5d17a2 authored by Tim Smith's avatar Tim Smith Committed by GitHub
Browse files

All Fedora releases are systemd now so simplify the check

parent 4b7db937
...@@ -114,8 +114,8 @@ when 'rhel', 'fedora' ...@@ -114,8 +114,8 @@ when 'rhel', 'fedora'
'uucp,news.crit' => "#{node['rsyslog']['default_log_dir']}/spooler", 'uucp,news.crit' => "#{node['rsyslog']['default_log_dir']}/spooler",
'local7.*' => "#{node['rsyslog']['default_log_dir']}/boot.log" 'local7.*' => "#{node['rsyslog']['default_log_dir']}/boot.log"
} }
# RHEL >= 7 and Fedora >= 19 use journald in systemd. Amazon Linux doesn't. # RHEL >= 7 and Fedora use journald in systemd. Amazon Linux doesn't.
if node['platform'] != 'amazon' && (node['platform_version'].to_i == 7 || node['platform_version'].to_i >= 19) if node['platform'] != 'amazon' && node['platform_version'].to_i >= 7
default['rsyslog']['modules'] = %w(imuxsock imjournal) default['rsyslog']['modules'] = %w(imuxsock imjournal)
default['rsyslog']['additional_directives'] = { 'OmitLocalLogging' => 'on', 'IMJournalStateFile' => 'imjournal.state' } default['rsyslog']['additional_directives'] = { 'OmitLocalLogging' => 'on', 'IMJournalStateFile' => 'imjournal.state' }
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment