tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated all templates to use instance variables

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
syslog/templates/logrotate.erb
View file

@ -1,5 +1,5 @@
/var/log/all.log {
create 0640 root <%= group %>
create 0640 root <%= @group %>
postrotate
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
/bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true

2
syslog/templates/rsyslog.conf.erb
View file

@ -8,7 +8,7 @@ $ModLoad imklog
# Provides support for local system logging (e.g. via logger command)
$ModLoad imuxsock
<% if operatingsystem == "OpenBSD" -%>
<% if @operatingsystem == "OpenBSD" -%>
# Local sockets for chrooted services
$AddUnixListenSocket /var/empty/dev/log
$AddUnixListenSocket /var/named/dev/log

6
syslog/templates/rsyslog.conf.server.erb
View file

@ -6,9 +6,9 @@ $UDPServerRun 514
$ModLoad imtcp.so
$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
$InputTCPServerStreamDriverMode 1
$InputTCPServerStreamDriverAuthMode x509/certvalid

26
syslog/templates/syslog.conf.client.erb
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 -%>

2
syslog/templates/syslog.conf.server.erb
View file

@ -2,7 +2,7 @@
*.* /srv/log/all.log
mark.* /srv/log/all.log
<% if syslog_type == "rsyslog" -%>
<% if @syslog_type == "rsyslog" -%>
# Remote logs only go in all.log
:fromhost-ip, !isequal, "127.0.0.1" ~