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

Commit 90b40aa6 authored by Tim Smith's avatar Tim Smith Committed by GitHub
Browse files

Merge pull request #121 from smartboxgroup/master

Removed empty value from default custom_remote in attributes
parents 0936ea0d 9bc637f9
......@@ -51,7 +51,7 @@ default['rsyslog']['tls_auth_mode'] = 'anon'
default['rsyslog']['tls_permitted_peer'] = nil
default['rsyslog']['use_local_ipv4'] = false
default['rsyslog']['allow_non_local'] = false
default['rsyslog']['custom_remote'] = [{}]
default['rsyslog']['custom_remote'] = []
default['rsyslog']['additional_directives'] = {}
# The most likely platform-specific attributes
......
......@@ -38,7 +38,7 @@ server_ips.each do |ip|
rsyslog_servers << { 'server' => ip, 'port' => node['rsyslog']['port'], 'logs' => node['rsyslog']['logs_to_forward'], 'protocol' => node['rsyslog']['protocol'], 'remote_template' => node['rsyslog']['default_remote_template'] }
end
unless node['rsyslog']['custom_remote'].first.empty?
unless node['rsyslog']['custom_remote'].empty? || node['rsyslog']['custom_remote'].first.empty?
node['rsyslog']['custom_remote'].each do |server|
if server['server'].nil?
Chef::Application.fatal!('Found a custom_remote server with no IP. Check your custom_remote attribute definition!')
......
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