Make timestamping configurable and only let dinstall have it for now

[dak.git] / config / debian / dinstall.variables

diff --git a/config/debian/dinstall.variables b/config/debian/dinstall.variables
index 0c1db1628131c2cc4f373752877a7e6359ac705d..000697fa71ec96dd6f0282972dbb491a9abe0b58 100644 (file)
--- 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" != "xfranckx" ]; then
+if [[ ${HOSTNAME} != franck ]]; then
     # Not our ftpmaster host
     MAILTO=${MAILTO:-"root"}
 else
@@ -22,8 +19,8 @@ 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"
@@ -55,3 +52,9 @@ for suite in testing unstable; do
     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