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
b3e89f35
Commit
b3e89f35
authored
Dec 23, 2019
by
Tim Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix amazon support in attributes
Signed-off-by:
Tim Smith
<
tsmith@chef.io
>
parent
5c03d84b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
.rubocop.yml
.rubocop.yml
+0
-3
attributes/default.rb
attributes/default.rb
+3
-3
kitchen.yml
kitchen.yml
+1
-1
No files found.
.rubocop.yml
View file @
b3e89f35
...
...
@@ -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 @
b3e89f35
...
...
@@ -113,7 +113,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 +125,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
...
...
kitchen.yml
View file @
b3e89f35
...
...
@@ -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
...
...
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