GitLab upgraded to 13.11.4-ee.0 - changelog: https://gitlab.com/gitlab-org/gitlab/blob/master/CHANGELOG-EE.md

Commit b3e89f35 authored by Tim Smith's avatar Tim Smith
Browse files

Fix amazon support in attributes


Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 5c03d84b
...@@ -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/**/*'
...@@ -113,7 +113,7 @@ when 'suse' ...@@ -113,7 +113,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 +125,8 @@ when 'rhel', 'fedora' ...@@ -125,8 +125,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
......
...@@ -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
......
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