Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mirror
rsyslog
Commits
90b40aa6
Commit
90b40aa6
authored
Dec 27, 2016
by
Tim Smith
Committed by
GitHub
Dec 27, 2016
Browse files
Merge pull request #121 from smartboxgroup/master
Removed empty value from default custom_remote in attributes
parents
0936ea0d
9bc637f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
attributes/default.rb
View file @
90b40aa6
...
...
@@ -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
...
...
recipes/client.rb
View file @
90b40aa6
...
...
@@ -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!'
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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