X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.daily;h=f57f6a8d958912e79affadc250abb4f0ba19e761;hb=d47da55f3658cae8230bc960b8dd497eaf6330e9;hp=d24c7f9a7e8baf55d88170ccbf865e695e41aa3d;hpb=1eeb90f6bf381e10fcd8f0a04437883b443855d5;p=dak.git

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index d24c7f9a..f57f6a8d 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -24,14 +24,24 @@ 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
-wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
+wget -q -O${TMPFILE} --ca-directory=/etc/ssl/ca-debian https://qa.debian.org/data/bts/wnpp_rm
 chmod go+r ${TMPFILE}
 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 -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
+
 # Update wanna-build dump
 echo "Update wanna-build database dump"
 $base/dak/scripts/nfu/get-w-b-db
@@ -46,6 +56,17 @@ dak override-disparity | gzip -9 > ${webdir}/override-disparity.gz
 # Generate stats about the new queue
 dak stats new ${webdir}/NEW-stats.yaml 2> /dev/null
 
+# Generate the contributor data
+# FIXME: In a day or three, when this worked from cron without
+# failure, redirect its output to dev/null. Alternatively until then
+# enrico added a --quiet and we use that.
+REQUESTS_CA_BUNDLE=/etc/ssl/ca-debian/ca-certificates.crt dc-tool --mine="${configdir}/contributor.source" --auth-token @"${base}/s3kr1t/contributor.auth" --source ftp.debian.org --post
+
 ${scriptsdir}/link_morgue.sh
 
 ################################################################################
+
+echo "Finally, all is done, compressing logfile"
+exec > /dev/null 2>&1
+
+bzip2 -9 "$LOGFILE"