From 63f5a5019d09ee0b6f0c9831e0e50e05436386f1 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 30 Jul 2014 11:19:57 +0300 Subject: [PATCH 1/2] yum::cron::download: Silence debug messages on EL7 On EL7 '-d 0' doesn't silence all debug messages. Also increase errorlevel by one. --- yum/manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp index d7c193b..797e5c1 100644 --- a/yum/manifests/init.pp +++ b/yum/manifests/init.pp @@ -36,9 +36,9 @@ class yum::cron::download { cron { "yum-cron-download": ensure => present, - command => "yum -d 0 -e 0 -y --downloadonly update", + command => "yum -d 0 -e 1 -y --downloadonly update >/dev/null", user => "root", - hour => 3, + hour => "3", minute => fqdn_rand(60), } From 14986647a45bf1900010ed4e2316698ed68689bd Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Tue, 5 Aug 2014 13:39:13 +0000 Subject: [PATCH 2/2] rsync-backup: Remote "*deleting " lines from email reports. Those are too common to be emailed all the time. --- rsync/templates/rsync-backup.sh.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rsync/templates/rsync-backup.sh.erb b/rsync/templates/rsync-backup.sh.erb index cf9bb6e..e6d6cb5 100644 --- a/rsync/templates/rsync-backup.sh.erb +++ b/rsync/templates/rsync-backup.sh.erb @@ -24,7 +24,7 @@ RSYNC_OPTS=( -ax <%= @acl ? "-A" : "" -%> <%= @options ? options : "" -%> --dele FLOCKEXIT=$? # flock's return code # Look for unknown lines in log -/bin/egrep -v "^$|([^ ]{11} )|([*]{5} )|(real|user|sys)" $LOGFILE >/dev/null 2>&1 +/bin/egrep -v "^$|([^ ]{11} )|([*]{5} )|(\*deleting )|(real|user|sys)" $LOGFILE >/dev/null 2>&1 if [ $? -eq 0 ]; then /bin/egrep -v "^([^ ]{11} )" $LOGFILE fi