X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.variables;h=000697fa71ec96dd6f0282972dbb491a9abe0b58;hb=bba165ccfeb6a260bba035a16ba4f0e78392fa81;hp=d2cdfd1cb3729abaa0284faac8168858f9d80161;hpb=be83a167b00a5bc56a91c57f30875d52179e188c;p=dak.git

diff --git a/config/debian/dinstall.variables b/config/debian/dinstall.variables
index d2cdfd1c..000697fa 100644
--- a/config/debian/dinstall.variables
+++ b/config/debian/dinstall.variables
@@ -2,11 +2,8 @@
 # usually we are not using debug logs. Set to 1 if you want them.
 DEBUG=0
 
-# our name
-PROGRAM="dinstall"
-
 # where do we want mails to go? For example log entries made with error()
-if [ "x$(hostname -s)x" != "xriesx" ]; then
+if [[ ${HOSTNAME} != franck ]]; then
     # Not our ftpmaster host
     MAILTO=${MAILTO:-"root"}
 else
@@ -22,15 +19,12 @@ DINSTALLSTART="${lockdir}/dinstallstart"
 # Marker for dinstall end
 DINSTALLEND="${lockdir}/dinstallend"
 
-# lock cron.unchecked (it immediately exits when this exists)
-LOCK_DAILY="$lockdir/daily.lock"
+# Timestamp for start
+DINSTALLBEGIN="$(date -u +"%a %b %d %T %Z %Y (%s)")"
 
 # Lock cron.unchecked from doing work
 LOCK_ACCEPTED="$lockdir/unchecked.lock"
 
-# Lock process-new from doing work
-LOCK_NEW="$lockdir/processnew.lock"
-
 # This file is simply used to indicate to britney whether or not
 # the Packages file updates completed sucessfully.  It's not a lock
 # from our point of view
@@ -43,8 +37,24 @@ LOCK_STOP="$lockdir/archive.stop"
 # Lock buildd updates
 LOCK_BUILDD="$lockdir/buildd.lock"
 
+# Lock changelog updates
+LOCK_CHANGELOG="$lockdir/changelog.lock"
+
 # Statefile for the users
 DINSTALLSTATE="${webdir}/dinstall.status"
 
-# The mirror trace file
-TRACEFILE="${ftpdir}/project/trace/ftp-master.debian.org"
+# dists for which we import external data (i18n, dep11)
+# as thats usually testing and unstable, but we need codenames,
+# get em out of the db.
+extimportdists=""
+for suite in testing unstable; do
+    codename=$(dak admin s show ${suite}|grep '^Codename')
+    codename=${codename##* }
+    extimportdists="${extimportdists} ${codename}"
+done
+
+# Common wget options
+wgetopts="-t2 -T20 -q -N --ca-directory=/etc/ssl/ca-debian"
+
+# dinstall wants timestamps added to stage logs
+TIMESTAMP=true