tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of bitbucket.org:tmakinen/puppet

Browse source
This commit is contained in:
Timo Makinen 2014-09-10 10:38:24 +03:00
commit 44ce682970
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rsync/templates/rsync-backup.sh.erb
View file

@ -24,7 +24,7 @@ RSYNC_OPTS=( -ax <%= @acl ? "-A" : "" -%> <%= @options ? options : "" -%> --dele
FLOCKEXIT=$? # flock's return code FLOCKEXIT=$? # flock's return code
# Look for unknown lines in log # 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 if [ $? -eq 0 ]; then
/bin/egrep -v "^([^ ]{11} )" $LOGFILE /bin/egrep -v "^([^ ]{11} )" $LOGFILE
fi fi

4
yum/manifests/init.pp
View file

@ -36,9 +36,9 @@ class yum::cron::download {
cron { "yum-cron-download": cron { "yum-cron-download":
ensure => present, ensure => present,
command => "yum -d 0 -e 0 -y --downloadonly update", command => "yum -d 0 -e 1 -y --downloadonly update >/dev/null",
user => "root", user => "root",
hour => 3, hour => "3",
minute => fqdn_rand(60), minute => fqdn_rand(60),
} }