X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fcron.hourly;h=51f9d8120a41983597019bdc21d2789f84ed8008;hb=69e884ae926d360481d333b9a4f72ef6e8f8cb6b;hp=e10365502535b8f2a0bacd183665b72aaa4b4b22;hpb=12e10a29eed2843efda0dfa13483a81877216cec;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index e1036550..51f9d812 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -20,10 +20,16 @@ dak import-users-from-passwd
 
 # do not run show-new and other stuff in parallel
 LOCKFILE="$lockdir/unchecked.lock"
+cleanup() {
+    rm -f "${LOCKFILE}"
+}
+
 if lockfile -r16 $LOCKFILE 2> /dev/null; then
+    trap cleanup EXIT
     do_new
     dak show-new > /dev/null || true
-    rm -f $LOCKFILE
+    cleanup
+    trap - EXIT
 fi
 
 dak queue-report -n > $webdir/new.html
@@ -42,7 +48,7 @@ $base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/rss/removals.rss
 
 
 # Tell ries to sync its tree
-ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org sync
+${scriptsdir}/sync-dd ries-sync ries-sync1 ries-sync2 sync
 
 $scriptsdir/generate-di