From: Aurelien Jarno Date: Sat, 2 Jan 2016 16:55:19 +0000 (+0100) Subject: Revert "cron.d/dsa-buildd: only look for .upload files" X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e260e1077c48c18051d70ceac33aa2341cf90003;p=mirror%2Fdsa-puppet.git Revert "cron.d/dsa-buildd: only look for .upload files" This reverts commit df6c4329e9b0395d76d7170581907c70116ecebf. Instead change buildd to avoid the condition to happen. Signed-off-by: Aurelien Jarno --- diff --git a/modules/buildd/files/cron.d-dsa-buildd b/modules/buildd/files/cron.d-dsa-buildd index e44b9e361..d165fdb7f 100644 --- a/modules/buildd/files/cron.d-dsa-buildd +++ b/modules/buildd/files/cron.d-dsa-buildd @@ -8,4 +8,5 @@ @reboot buildd2 [ -f ~buildd2/NO-DAEMON-PLEASE ] && grep 'delete-on-boot' ~buildd2/NO-DAEMON-PLEASE > /dev/null && rm -f ~buildd2/NO-DAEMON-PLEASE && if [ -x ~buildd2/.bootscript ]; then ~buildd2/.bootscript; else buildd-watcher; fi # Clean old files in the upload queues after 60 days -@daily buildd find ~buildd/upload/ ~buildd/upload-security/ -type f -mtime +60 -name '*.upload' | xargs -r awk 'BEGINFILE { DIRNAME=FILENAME ; sub("/[^/]*$", "", DIRNAME) } /^u/ { print DIRNAME"/"$2 } ENDFILE { print FILENAME }' | xargs -r rm -f +@daily buildd [ -d ~buildd/upload ] && find ~buildd/upload -type f -mtime +60 -delete +@daily buildd [ -d ~buildd/upload-security ] && find ~buildd/upload-security -type f -mtime +60 -delete