Updated all templates to use instance variables

This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions

View file

@ -1,28 +1,28 @@
*.* <% if operatingsystem != "OpenBSD" %>-<% end %>/var/log/all.log
mark.* <% if operatingsystem != "OpenBSD" %>-<% end %>/var/log/all.log
<% if has_variable?('syslog_tlsserver') and syslog_type == "rsyslog" -%>
*.* <% if @operatingsystem != "OpenBSD" %>-<% end %>/var/log/all.log
mark.* <% if @operatingsystem != "OpenBSD" %>-<% end %>/var/log/all.log
<% if @syslog_tlsserver and @syslog_type == "rsyslog" -%>
$DefaultNetstreamDriver gtls
$DefaultNetstreamDriverCAFile <%= puppet_ssldir %>/certs/ca.pem
$DefaultNetstreamDriverCertFile <%= puppet_ssldir %>/certs/<%= homename %>.pem
$DefaultNetstreamDriverKeyFile <%= puppet_ssldir %>/private_keys/<%= homename %>.pem
$DefaultNetstreamDriverCAFile <%= @puppet_ssldir %>/certs/ca.pem
$DefaultNetstreamDriverCertFile <%= @puppet_ssldir %>/certs/<%= @homename %>.pem
$DefaultNetstreamDriverKeyFile <%= @puppet_ssldir %>/private_keys/<%= @homename %>.pem
$ActionSendStreamDriverMode 1
$ActionSendStreamDriverAuthMode x509/name
$ActionSendStreamDriverPermittedPeer <%= syslog_tlsserver %>
$ActionSendStreamDriverPermittedPeer <%= @syslog_tlsserver %>
$WorkDirectory /var/spool/rsyslog
$ActionQueueFileName <%= syslog_tlsserver %>
$ActionQueueFileName <%= @syslog_tlsserver %>
$ActionQueueMaxDiskSpace 100M
$ActionQueueSaveOnShutdown on
$ActionQueueType LinkedList
$ActionResumeRetryCount -1
*.* @@<%= syslog_tlsserver %>
mark.* @@<%= syslog_tlsserver %>
<% elsif has_variable?('syslog_server') -%>
*.* @@<%= @syslog_tlsserver %>
mark.* @@<%= @syslog_tlsserver %>
<% elsif @syslog_server -%>
*.* @<%= syslog_server %>
mark.* @<%= syslog_server %>
*.* @<%= @syslog_server %>
mark.* @<%= @syslog_server %>
<% end -%>