X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=e10365502535b8f2a0bacd183665b72aaa4b4b22;hb=1617994b76d0cd90ce89a7e6d9f7bb886439f010;hp=9f2266d8f1cdb6f3174379b73637b3653df22ac8;hpb=09a1a20566dcf84ca229b4339bd8f8080eb59afd;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 9f2266d8..e1036550 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -9,11 +9,14 @@ set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+PROGRAM="Hourly"
+########################################################################
+# Functions                                                            #
+########################################################################
+# common functions are "outsourced"
+. "${configdir}/common"
+
 dak import-users-from-passwd
-dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir/stat
-dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
-dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 # do not run show-new and other stuff in parallel
 LOCKFILE="$lockdir/unchecked.lock"
@@ -23,6 +26,11 @@ if lockfile -r16 $LOCKFILE 2> /dev/null; then
     rm -f $LOCKFILE
 fi
 
+dak queue-report -n > $webdir/new.html
+dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
+dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+dak graph -n new,byhand,stable-new,oldstable-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+
 cd $webdir
 cat removals-20*.txt > removals-full.txt
 cat removals.txt >> removals-full.txt
@@ -38,6 +46,12 @@ ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1
 
 $scriptsdir/generate-di
 
+# Push files over to security
+#pg_dump -a -F p -t files | sed -e "s,^COPY files (,DELETE FROM external_files; COPY external_files (," | xz -3 | \
+#        ssh -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/push-external_files dak@wherever sync
+#
+# The key should run the following command:
+#        'xzcat | pg_restore -1 -a'
 
 # do the buildd key updates
 BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)