Put remote logs only in all.log when using rsyslog server

This commit is contained in:
Ossi Salmi 2013-03-01 14:23:00 +02:00
parent f17eacf99a
commit e6c709a9c2
2 changed files with 14 additions and 8 deletions

View file

@ -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"], ],
}