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 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), }