Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
mirror
rsyslog
Commits
8477ab2f
Unverified
Commit
8477ab2f
authored
Dec 23, 2019
by
Tim Smith
Committed by
GitHub
Dec 23, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #160 from chef-cookbooks/expand_testing
Fix amazon linux /opensuse support
parents
c902687a
5a61c1c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
13 deletions
+6
-13
.rubocop.yml
.rubocop.yml
+0
-3
attributes/default.rb
attributes/default.rb
+4
-8
kitchen.yml
kitchen.yml
+1
-1
metadata.rb
metadata.rb
+1
-1
No files found.
.rubocop.yml
View file @
8477ab2f
...
...
@@ -5,9 +5,6 @@ Lint/AmbiguousRegexpLiteral:
Exclude
:
-
'
test/**/*'
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
# SupportedStyles: slashes, percent_r, mixed
Style/RegexpLiteral
:
Exclude
:
-
'
test/**/*'
attributes/default.rb
View file @
8477ab2f
...
...
@@ -96,6 +96,7 @@ case node['platform_family']
when
'suse'
default
[
'rsyslog'
][
'service_name'
]
=
'syslog'
default
[
'rsyslog'
][
'group'
]
=
'root'
default
[
'rsyslog'
][
'dir_group'
]
=
'trusted'
default
[
'rsyslog'
][
'default_facility_logs'
]
=
{
'*.emerg'
=>
':omusrmsg:*'
,
'mail.*'
=>
"-
#{
node
[
'rsyslog'
][
'default_log_dir'
]
}
/mail.log"
,
...
...
@@ -113,7 +114,7 @@ when 'suse'
'local4.*;local5.*'
=>
"-
#{
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'
# format { facility => destination }
default
[
'rsyslog'
][
'default_facility_logs'
]
=
{
...
...
@@ -125,8 +126,8 @@ when 'rhel', 'fedora'
'uucp,news.crit'
=>
"
#{
node
[
'rsyslog'
][
'default_log_dir'
]
}
/spooler"
,
'local7.*'
=>
"
#{
node
[
'rsyslog'
][
'default_log_dir'
]
}
/boot.log"
,
}
#
RHEL >= 7 and Fedora use journald in systemd. Amazon Linux doesn't.
if
node
[
'
platform'
]
!=
'amazon'
&&
node
[
'platform_version'
].
to_i
>=
7
#
journald is used in systemd
if
node
[
'
init_package'
]
!=
'systemd'
default
[
'rsyslog'
][
'modules'
]
=
%w(imuxsock imjournal)
default
[
'rsyslog'
][
'additional_directives'
]
=
{
'OmitLocalLogging'
=>
'on'
,
'IMJournalStateFile'
=>
'imjournal.state'
}
end
...
...
@@ -150,8 +151,3 @@ else
'*.emerg'
=>
':omusrmsg:*'
,
}
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
kitchen.yml
View file @
8477ab2f
...
...
@@ -16,7 +16,7 @@ platforms:
-
name
:
centos-8
-
name
:
debian-9
-
name
:
debian-10
-
name
:
fedora-
29
-
name
:
fedora-
31
-
name
:
opensuse-leap-15
-
name
:
ubuntu-16.04
-
name
:
ubuntu-18.04
...
...
metadata.rb
View file @
8477ab2f
...
...
@@ -5,7 +5,7 @@ license 'Apache-2.0'
description
'Installs and configures rsyslog'
version
'6.0.7'
%w(ubuntu debian mint redhat centos amazon scientific oracle fedora zlinux)
.
each
do
|
os
|
%w(ubuntu debian
linux
mint redhat centos amazon scientific oracle fedora zlinux)
.
each
do
|
os
|
supports
os
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment