Loadsa changes to make new cronscript way work

[dak.git] / config / debian / vars

diff --git a/config/debian/vars b/config/debian/vars
index 5907d28c8802b6b29848e873016129e46b02b40f..83cbcf1bd7c6a924728b6bf3cf723993a8dba592 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,3 +1,4 @@
+# -*- mode:sh -*-
 # locations used by many scripts
 
 base=/srv/ftp-master.debian.org
@@ -23,14 +24,14 @@ queuedir=$base/queue/
 unchecked=$queuedir/unchecked/
 accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
-incoming=$base/incoming
+incoming=$base/public/incoming.debian.org/
 newstage=$queuedir/newstage/
 exportdir=$base/export/
 exportpublic=$public/rsync/export/
 
 ftpgroup=debadmin
 
-copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free squeeze.contrib squeeze.contrib.src squeeze.main squeeze.main.src squeeze.non-free squeeze.non-free.src squeeze.extra.main squeeze.extra.contrib squeeze.extra.non-free"
+public_archives=(ftp-master backports debian-debug)
 
 TMPDIR=${base}/tmp
 
@@ -39,5 +40,10 @@ umask 022
 unset CDPATH
 GZIP='--rsyncable' ; export GZIP
 
+# lock cron.unchecked (it immediately exits when this exists)
+LOCK_DAILY="$lockdir/daily.lock"
+LOCK_UNCHECKED="$lockdir/unchecked.lock"
+LOCK_STOP="$lockdir/archive.stop"
+
 # Set the database variables
 eval $(dak admin config db-shell)