From ebe3985d952dda3e42f6856726de216b07e64c26 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 13 Jun 2017 17:21:13 +0200
Subject: reproducible Debian: move proxy check to maintenance job…
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 bin/reproducible_maintenance.sh       | 15 +++++++++++++++
 bin/reproducible_node_health_check.sh | 10 ----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index e71f3dc4..2e017525 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -52,6 +52,21 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 	fi
 fi
 
+#
+# we fail hard
+#
+set +e
+
+#
+# check for working proxy
+#
+echo "$(date -u) - testing whether the proxy works..."
+curl http://www.debian.org > /dev/null
+if [ $? -ne 0 ] ; then
+	echo "Warning: curl http://www.debian.org failed, probably the proxy is down for $HOSTNAME…"
+	DIRTY=true
+fi
+
 echo "$(date -u) - updating the schroots and pbuilder now..."
 # use host architecture (only)
 ARCH=$(dpkg --print-architecture)
diff --git a/bin/reproducible_node_health_check.sh b/bin/reproducible_node_health_check.sh
index 686e035b..e4dd61fd 100755
--- a/bin/reproducible_node_health_check.sh
+++ b/bin/reproducible_node_health_check.sh
@@ -37,16 +37,6 @@ show_fstab_and_mounts() {
 #
 set +e
 
-#
-# check for working proxy
-#
-echo "$(date -u) - testing whether the proxy works..."
-curl http://www.debian.org > /dev/null
-if [ $? -ne 0 ] ; then
-	echo "Warning: curl http://www.debian.org failed, probably the proxy is down for $HOSTNAME…"
-	DIRTY=true
-fi
-
 #
 # check for /dev/shm being mounted properly
 #
-- 
cgit v1.2.3-54-g00ecf