X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.daily;h=85bd99e1281b4ea7e8b5cf00cabd5e679a8e36a9;hb=af80894b172ada51e5536fe36d1ac4385567d0c2;hp=90c990317a3b09c6bcb90f42024f335ea21cc364;hpb=b443bf8ab00a8a7ca9fc3def9a99d428839577d6;p=dak.git

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 90c99031..85bd99e1 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -24,7 +24,9 @@ trap cleanup SIGHUP SIGINT SIGPIPE SIGTERM EXIT ERR
 
 # log to dinstall's logfile instead of sending email
 PROGRAM="cron.daily"
-LOGFILE="$logdir/dinstall.log"
+# Start logging
+NOW=`date "+%Y.%m.%d-%H:%M:%S"`
+LOGFILE="$logdir/daily_${NOW}.log"
 exec >> "$LOGFILE" 2>&1
 
 # get the latest list of wnpp bugs and their source packages
@@ -34,9 +36,8 @@ mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
 
 # Push files over to security
 # The key over there should have the following set for the ssh key:
-#  command="/usr/bin/xzcat | /usr/bin/psql -f - -1 obscurity"
-pg_dump -a -F p -t files | \
-            sed -e "s,^COPY files (,DELETE FROM external_files; COPY external_files (," | \
+#  command="/usr/bin/xzcat | /usr/bin/psql -1 -c 'DELETE FROM external_files; COPY external_files (id, filename, size, md5sum, last_used, sha1sum, sha256sum, created, modified) FROM STDIN' obscurity"
+psql -c 'COPY files (id, filename, size, md5sum, last_used, sha1sum, sha256sum, created, modified) TO STDOUT' projectb | \
             xz -3 | \
             ssh -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 \
                 -i ${base}/s3kr1t/push_external_files dak@security-master.debian.org sync
@@ -64,3 +65,8 @@ dc-tool --mine="${configdir}/contributor.source" --auth-token @"${base}/s3kr1t/c
 ${scriptsdir}/link_morgue.sh
 
 ################################################################################
+
+echo "Finally, all is done, compressing logfile"
+exec > /dev/null 2>&1
+
+bzip2 -9 "$LOGFILE"