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

Fix merge artifact

parent ac831cfa
......@@ -36,24 +36,14 @@ $InputTCPServerStreamDriverAuthMode <%= node['rsyslog']['tls_auth_mode'] || 'ano
$InputTCPServerRun <%= node['rsyslog']['port'] %>
# Provide <%= node['rsyslog']['protocol'].upcase %> log reception
<% else -%>
<<<<<<< HEAD
<% if node['rsyslog']['protocol'] =~ /tcp/ %>
$ModLoad imtcp
$InputTCPServerRun <%= node['rsyslog']['port'] %>
<% end -%>
<% if node['rsyslog']['protocol'] =~ /udp/ %>
$ModLoad imudp
$UDPServerAddress <%= node['rsyslog']['bind'] %>
$UDPServerRun <%= node['rsyslog']['port'] %>
=======
<% case node['rsyslog']['protocol'] -%>
<% when "tcp" -%>
$ModLoad imtcp
$InputTCPServerRun <%= node['rsyslog']['port'] %>
<% when "udp" -%>
$ModLoad imudp
$UDPServerAddress <%= node['rsyslog']['bind'] %>
$UDPServerRun <%= node['rsyslog']['port'] %>
>>>>>>> 03a54a9893fc72293ff7dbd9880d012080a2d00e
<% end -%>
<% end -%>
<% end -%>
......
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