From e6c709a9c26c5442b147aad17faec02596d0173e Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Fri, 1 Mar 2013 14:23:00 +0200 Subject: [PATCH] Put remote logs only in all.log when using rsyslog server --- syslog/manifests/init.pp | 12 ++++++------ syslog/templates/syslog.conf.server.erb | 10 ++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp index 61c457d..adb2064 100644 --- a/syslog/manifests/init.pp +++ b/syslog/manifests/init.pp @@ -331,8 +331,8 @@ class syslog::standalone inherits syslog::common::standalone { class syslog::standalone::syslogd inherits syslog::client::syslogd { File["/etc/syslog.conf"] { - content => template("syslog/syslog.conf.$operatingsystem.erb", - "syslog/syslog.conf.server.erb"), + content => template("syslog/syslog.conf.server.erb", + "syslog/syslog.conf.$operatingsystem.erb"), require => [ File["/srv/log"], File["/var/log/all.log"], ], } @@ -346,8 +346,8 @@ class syslog::standalone::rsyslog inherits syslog::client::rsyslog { File["/etc/rsyslog.conf"] { content => template("syslog/rsyslog.conf.erb", - "syslog/syslog.conf.$operatingsystem.erb", - "syslog/syslog.conf.server.erb"), + "syslog/syslog.conf.server.erb", + "syslog/syslog.conf.$operatingsystem.erb"), require => [ File["/srv/log"], File["/var/log/all.log"], ], } @@ -375,8 +375,8 @@ class syslog::server::rsyslog inherits syslog::client::rsyslog { File["/etc/rsyslog.conf"] { content => template("syslog/rsyslog.conf.erb", "syslog/rsyslog.conf.server.erb", - "syslog/syslog.conf.$operatingsystem.erb", - "syslog/syslog.conf.server.erb"), + "syslog/syslog.conf.server.erb", + "syslog/syslog.conf.$operatingsystem.erb"), require => [ File["/srv/log"], File["/var/log/all.log"], ], } diff --git a/syslog/templates/syslog.conf.server.erb b/syslog/templates/syslog.conf.server.erb index d58b076..0691b66 100644 --- a/syslog/templates/syslog.conf.server.erb +++ b/syslog/templates/syslog.conf.server.erb @@ -1,3 +1,9 @@ +# Everything goes here +*.* /srv/log/all.log +mark.* /srv/log/all.log -*.* /srv/log/all.log -mark.* /srv/log/all.log +<% if syslog_type == "rsyslog" -%> +# Remote logs only go in all.log +:fromhost-ip, !isequal, "127.0.0.1" ~ + +<% end -%>