Unverified Commit 8477ab2f authored by Tim Smith's avatar Tim Smith Committed by GitHub

Merge pull request #160 from chef-cookbooks/expand_testing

Fix amazon linux /opensuse support
parents c902687a 5a61c1c2
...@@ -5,9 +5,6 @@ Lint/AmbiguousRegexpLiteral: ...@@ -5,9 +5,6 @@ Lint/AmbiguousRegexpLiteral:
Exclude: Exclude:
- 'test/**/*' - 'test/**/*'
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
# SupportedStyles: slashes, percent_r, mixed
Style/RegexpLiteral: Style/RegexpLiteral:
Exclude: Exclude:
- 'test/**/*' - 'test/**/*'
...@@ -96,6 +96,7 @@ case node['platform_family'] ...@@ -96,6 +96,7 @@ case node['platform_family']
when 'suse' when 'suse'
default['rsyslog']['service_name'] = 'syslog' default['rsyslog']['service_name'] = 'syslog'
default['rsyslog']['group'] = 'root' default['rsyslog']['group'] = 'root'
default['rsyslog']['dir_group'] = 'trusted'
default['rsyslog']['default_facility_logs'] = { default['rsyslog']['default_facility_logs'] = {
'*.emerg' => ':omusrmsg:*', '*.emerg' => ':omusrmsg:*',
'mail.*' => "-#{node['rsyslog']['default_log_dir']}/mail.log", 'mail.*' => "-#{node['rsyslog']['default_log_dir']}/mail.log",
...@@ -113,7 +114,7 @@ when 'suse' ...@@ -113,7 +114,7 @@ when 'suse'
'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', 'amazon'
default['rsyslog']['working_dir'] = '/var/lib/rsyslog' default['rsyslog']['working_dir'] = '/var/lib/rsyslog'
# format { facility => destination } # format { facility => destination }
default['rsyslog']['default_facility_logs'] = { default['rsyslog']['default_facility_logs'] = {
...@@ -125,8 +126,8 @@ when 'rhel', 'fedora' ...@@ -125,8 +126,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 use journald in systemd. Amazon Linux doesn't. # journald is used in systemd
if node['platform'] != 'amazon' && node['platform_version'].to_i >= 7 if node['init_package'] != 'systemd'
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
...@@ -150,8 +151,3 @@ else ...@@ -150,8 +151,3 @@ else
'*.emerg' => ':omusrmsg:*', '*.emerg' => ':omusrmsg:*',
} }
end end
# rsyslog 3/4 do not support the new :omusrmsg:* format and need * instead
if platform_family?('rhel') && node['platform_version'].to_i < 6
default['rsyslog']['default_facility_logs']['*.emerg'] = '*'
end
...@@ -16,7 +16,7 @@ platforms: ...@@ -16,7 +16,7 @@ platforms:
- name: centos-8 - name: centos-8
- name: debian-9 - name: debian-9
- name: debian-10 - name: debian-10
- name: fedora-29 - name: fedora-31
- name: opensuse-leap-15 - name: opensuse-leap-15
- name: ubuntu-16.04 - name: ubuntu-16.04
- name: ubuntu-18.04 - name: ubuntu-18.04
......
...@@ -5,7 +5,7 @@ license 'Apache-2.0' ...@@ -5,7 +5,7 @@ license 'Apache-2.0'
description 'Installs and configures rsyslog' description 'Installs and configures rsyslog'
version '6.0.7' version '6.0.7'
%w(ubuntu debian mint redhat centos amazon scientific oracle fedora zlinux).each do |os| %w(ubuntu debian linuxmint redhat centos amazon scientific oracle fedora zlinux).each do |os|
supports os supports os
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