Loadsa changes to make new cronscript way work

[dak.git] / config / debian / cron.monthly

diff --git a/config/debian/cron.monthly b/config/debian/cron.monthly
index 980cb6d6905d63651932c50e6d516d80f804e876..1f92f914605a14530bfe65ad24eb6d9f61a969c0 100755 (executable)
--- a/config/debian/cron.monthly
+++ b/config/debian/cron.monthly
@@ -3,6 +3,7 @@
 # Run at the beginning of the month via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
@@ -11,25 +12,20 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 
 DATE=`date -d yesterday +%y%m`
 
-cd ${base}/mail/archive
-for m in mail bxamail; do
-    if [ -f $m ]; then
-        mv $m ${m}-$DATE
-        touch ${m}
-        chown dak:ftpteam ${m}
-        chmod 660 ${m}
-        sleep 20
-        xz -9 ${m}-$DATE
-        chgrp $ftpgroup ${m}-$DATE.xz
-        chmod 660 ${m}-$DATE.xz
-    fi;
-done
-
-DATE=`date +%Y-%m`
+DATE=$(date +%Y-%m)
+OLDDATE=$(date -d yesterday +%Y-%m)
 cd ${base}/log
 touch $DATE
 ln -sf $DATE current
 chmod g+w $DATE
 chown dak:ftpteam $DATE
+xz -9 ${OLDDATE}
+
+cd /srv/upload.debian.org/queued
+sudo -u dak-unpriv /srv/upload.debian.org/queued/debianqueued -k || true
+mv run/log log.${OLDDATE}
+sudo -u dak-unpriv touch run/log
+xz -9 log.${OLDDATE}
+sudo -u dak-unpriv /srv/upload.debian.org/queued/debianqueued 2>/dev/null
 
 ################################################################################