Commit 99268c03 authored by Tim Smith's avatar Tim Smith
Browse files

Cookstyle fixes



Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 90b40aa6
...@@ -21,7 +21,7 @@ namespace :style do ...@@ -21,7 +21,7 @@ namespace :style do
FoodCritic::Rake::LintTask.new(:chef) do |t| FoodCritic::Rake::LintTask.new(:chef) do |t|
t.options = { t.options = {
fail_tags: ['any'], fail_tags: ['any'],
progress: true progress: true,
} }
end end
rescue LoadError rescue LoadError
......
...@@ -100,7 +100,7 @@ when 'suse' ...@@ -100,7 +100,7 @@ when 'suse'
'local0.*;local1.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages", 'local0.*;local1.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages",
'local2.*;local3.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages", 'local2.*;local3.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages",
'local4.*;local5.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages", 'local4.*;local5.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages",
'local6.*;local7.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages" 'local6.*;local7.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages",
} }
when 'rhel', 'fedora' when 'rhel', 'fedora'
default['rsyslog']['working_dir'] = '/var/lib/rsyslog' default['rsyslog']['working_dir'] = '/var/lib/rsyslog'
...@@ -112,7 +112,7 @@ when 'rhel', 'fedora' ...@@ -112,7 +112,7 @@ when 'rhel', 'fedora'
'cron.*' => "#{node['rsyslog']['default_log_dir']}/cron", 'cron.*' => "#{node['rsyslog']['default_log_dir']}/cron",
'*.emerg' => ':omusrmsg:*', '*.emerg' => ':omusrmsg:*',
'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 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 if node['platform'] != 'amazon' && node['platform_version'].to_i >= 7
...@@ -136,7 +136,7 @@ else ...@@ -136,7 +136,7 @@ else
'news.notice' => "-#{node['rsyslog']['default_log_dir']}/news/news.notice", 'news.notice' => "-#{node['rsyslog']['default_log_dir']}/news/news.notice",
'*.=debug;auth,authpriv.none;news.none;mail.none' => "-#{node['rsyslog']['default_log_dir']}/debug", '*.=debug;auth,authpriv.none;news.none;mail.none' => "-#{node['rsyslog']['default_log_dir']}/debug",
'*.=info;*.=notice;*.=warn;auth,authpriv.none;cron,daemon.none;mail,news.none' => "-#{node['rsyslog']['default_log_dir']}/messages", '*.=info;*.=notice;*.=warn;auth,authpriv.none;cron,daemon.none;mail,news.none' => "-#{node['rsyslog']['default_log_dir']}/messages",
'*.emerg' => ':omusrmsg:*' '*.emerg' => ':omusrmsg:*',
} }
end end
......
Supports Markdown
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