From a287fe471803d28352e509136958cb28f67aa02c Mon Sep 17 00:00:00 2001 From: Bill MacAllister <whm@stanford.edu> Date: Sun, 24 Nov 2013 16:40:53 -0800 Subject: [PATCH] syslog: correct fragment, add a default rule for remote logging --- manifests/syslog/fragment.pp | 2 +- templates/syslog/etc/rsyslog.d/80-remote-default.pp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 templates/syslog/etc/rsyslog.d/80-remote-default.pp diff --git a/manifests/syslog/fragment.pp b/manifests/syslog/fragment.pp index d71f461..83a6e64 100644 --- a/manifests/syslog/fragment.pp +++ b/manifests/syslog/fragment.pp @@ -31,7 +31,7 @@ define base::syslog::fragment( { $realname = "/etc/rsyslog.d/$name" $codename = "syslog::fragment" - $basetmpl = "base/etc/rsyslog.d/${name}.erb" + $basetmpl = "base/syslog/etc/rsyslog.d/${name}.erb" # Useful default template values if $syslog_target { diff --git a/templates/syslog/etc/rsyslog.d/80-remote-default.pp b/templates/syslog/etc/rsyslog.d/80-remote-default.pp new file mode 100644 index 0000000..d1ad48c --- /dev/null +++ b/templates/syslog/etc/rsyslog.d/80-remote-default.pp @@ -0,0 +1,9 @@ +# 80-remote-default.conf +# +# Default remote logging when we don't have any other rules to +# direct the logging from remote hosts. + +$template Remote, "/var/log/remote/default.log" +:source , !isequal , "<%= hostname %>" -?Remote +:source , !isequal , "<%= hostname %>" stop + -- GitLab