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

syslog: Added option to enable resolving DNS names

Browse source
This commit is contained in:
Ossi Salmi 2013-07-13 21:36:48 +03:00
parent d30b81a585
commit 8846d074c2
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
syslog/manifests/init.pp
View file

@ -10,6 +10,9 @@
# Group name which has permissions to read logs. Defaults to # Group name which has permissions to read logs. Defaults to
# wheel or root depending on operating system. # wheel or root depending on operating system.
# #
# $syslog_resolve_names:
# Resolve DNS names for remote messages if "true". Defaults to "false".
#
class syslog::common { class syslog::common {
if !$syslog_type { if !$syslog_type {
@ -36,6 +39,10 @@ class syslog::common {
} }
} }
if ! $syslog_resolve_names {
$syslog_resolve_names = "false"
}
case $kernel { case $kernel {
"linux": { "linux": {
file { "/etc/logrotate.d/syslog.all": file { "/etc/logrotate.d/syslog.all":
@ -190,7 +197,7 @@ class syslog::client::rsyslog {
mode => "0555", mode => "0555",
owner => "root", owner => "root",
group => "wheel", group => "wheel",
source => "puppet:///modules/syslog/rsyslogd.rc", content => template("syslog/rsyslogd.rc.erb"),
backup => ".orig", backup => ".orig",
before => Service["rsyslog"], before => Service["rsyslog"],
} }

4
syslog/files/rsyslogd.rc → syslog/templates/rsyslogd.rc.erb Executable file → Normal file
View file

@ -1,7 +1,11 @@
#!/bin/sh #!/bin/sh
daemon="/usr/local/sbin/rsyslogd" daemon="/usr/local/sbin/rsyslogd"
<% if @syslog_resolve_names == "true" -%>
daemon_flags="-c 4 -i /var/run/syslog.pid"
<% else -%>
daemon_flags="-x -c 4 -i /var/run/syslog.pid" daemon_flags="-x -c 4 -i /var/run/syslog.pid"
<% end -%>
. /etc/rc.d/rc.subr . /etc/rc.d/rc.subr