Merge branch 'master' into dbtests

[dak.git] / config / debian / cron.reboot

diff --git a/config/debian/cron.reboot b/config/debian/cron.reboot
index b3c0b09a6e46fe9e100079764d20bd14c9468870..b0129733422ee1ff4e8e4ec40e13f356a4cd1654 100755 (executable)
--- a/config/debian/cron.reboot
+++ b/config/debian/cron.reboot
@@ -20,9 +20,13 @@
 set -e
 # make sure to only use defined variables
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # common functions are "outsourced"
@@ -35,7 +39,7 @@ DEBUG=0
 PROGRAM="dinstall_reboot"
 
 # where do we want mails to go? For example log entries made with error()
-if [ "x$(hostname -s)x" != "xriesx" ]; then
+if [ "x$(hostname -s)x" != "xfranckx" ]; then
     # Not our ftpmaster host
     MAILTO=${MAILTO:-"root"}
 else