set MAILTO=root in dsa-puppet-stuff header

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 9e1c384..27a3c87 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -185,6 +185,7 @@ class debian_org {
                content  => @(EOF)
                        ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
                        SHELL=/bin/bash
+                       MAILTO=root
                        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
                        | EOF
        }

diff --git a/modules/munin/files/master-cleanup-cron b/modules/munin/files/master-cleanup-cron
index a55cc26..3138588 100644 (file)
--- a/modules/munin/files/master-cleanup-cron
+++ b/modules/munin/files/master-cleanup-cron
@@ -1,8 +1,6 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 
-MAILTO=root
-
 @daily munin    find /var/lib/munin  -maxdepth 1 -type f -name 'state-*' -mtime +90 -delete
 @daily munin    find /var/lib/munin/debian.org -maxdepth 1 -type f -mtime +90 -delete
 @daily www-data find /var/lib/munin/cgi-tmp -type f -mtime +10 -delete ; find /var/lib/munin/cgi-tmp -mindepth 2 -type d -empty -delete