From: Stephen Gran <steve@lobefin.net>
Date: Thu, 21 May 2009 22:02:54 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6438ffad650510548a6308f8c00a459eb4d4c522;hp=04dc26990eadfcfe352f9bf50868e3a573c9f479;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/files/etc/logrotate.d/syslog-ng b/files/etc/logrotate.d/syslog-ng
index 999785a5a..37fcbac5f 100644
--- a/files/etc/logrotate.d/syslog-ng
+++ b/files/etc/logrotate.d/syslog-ng
@@ -71,6 +71,8 @@
    missingok
    notifempty
    compress
+   # listmaster asked for this one
+   delaycompress
 }
 
 /var/log/mail.warn {
diff --git a/files/etc/syslog-ng/syslog-ng.conf b/files/etc/syslog-ng/syslog-ng.conf
index f67cc9a7f..d4afc62c4 100644
--- a/files/etc/syslog-ng/syslog-ng.conf
+++ b/files/etc/syslog-ng/syslog-ng.conf
@@ -105,6 +105,9 @@ destination df_daemon { file("/var/log/daemon.log"); };
 destination df_kern { file("/var/log/kern.log"); };
 destination df_lpr { file("/var/log/lpr.log"); };
 destination df_mail { file("/var/log/mail.log" group(maillog)); };
+destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
+destination df_mail_warn { file("/var/log/mail.warn" group(maillog)); };
+destination df_mail_err { file("/var/log/mail.err" group(maillog)); };
 destination df_user { file("/var/log/user.log" perm(0644)); };
 destination df_uucp { file("/var/log/uucp.log"); };
 
@@ -264,7 +267,7 @@ log {
         source(s_all);
         filter(f_mail);
         filter(f_at_least_info);
-        destination(df_facility_dot_info);
+        destination(df_mail_info);
 };
 
 # mail.warn                       -/var/log/mail.warn
@@ -272,7 +275,7 @@ log {
         source(s_all);
         filter(f_mail);
         filter(f_at_least_warn);
-        destination(df_facility_dot_warn);
+        destination(df_mail_warn);
 };
 
 # mail.err                        /var/log/mail.err
@@ -280,7 +283,7 @@ log {
         source(s_all);
         filter(f_mail);
         filter(f_at_least_err);
-        destination(df_facility_dot_err);
+        destination(df_mail_err);
 };
 
 # news.crit                       /var/log/news/news.crit
diff --git a/manifests/site.pp b/manifests/site.pp
index cdecc6394..809d74c46 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,7 +47,7 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte:  { include apache2 }
+                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
                         default:   {}
                    } }
         default: {}