From 75a4ebd70cfca375473da0ac1fd0c2259dbd76a7 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 6 Jul 2008 11:25:01 +0200
Subject: [PATCH] [project @
 peter@palfrader.org-20080706092501-vcfmb7awy7zf9erj] Move apt status update
 from cron.daily to usr/sbin/dsa-update-apt-status

---
 dsa-nagios-nrpe-config/debian/changelog      |  6 +++
 dsa-nagios-nrpe-config/debian/cron.daily     | 41 +-------------------
 dsa-nagios-nrpe-config/debian/rules          |  2 +
 dsa-nagios-nrpe-config/dsa-update-apt-status | 40 +++++++++++++++++++
 4 files changed, 49 insertions(+), 40 deletions(-)
 create mode 100755 dsa-nagios-nrpe-config/dsa-update-apt-status

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index 7769bd9..a582cbf 100644
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,9 @@
+dsa-nagios-nrpe-config (XX) unstable; urgency=low
+
+  * Move apt status update from cron.daily to usr/sbin/dsa-update-apt-status
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 06 Jul 2008 11:23:44 +0200
+
 dsa-nagios-nrpe-config (45) unstable; urgency=low
 
   * Add apt upgrades check.
diff --git a/dsa-nagios-nrpe-config/debian/cron.daily b/dsa-nagios-nrpe-config/debian/cron.daily
index cdb700f..09b9631 100644
--- a/dsa-nagios-nrpe-config/debian/cron.daily
+++ b/dsa-nagios-nrpe-config/debian/cron.daily
@@ -2,43 +2,4 @@
 
 [ -x /usr/share/dsa/weak-ssh-keys-check ] && /usr/share/dsa/weak-ssh-keys-check -s /var/cache/dsa/nagios/weak-ssh-keys
 
-(
-	UPDATE_RUNS=3
-	STATUS=/var/cache/dsa/nagios/apt
-
-	if [ -z "$TERM" -o "$TERM" = "dumb" ]; then
-		sleep $(( $RANDOM % 7200 ))
-	fi
-	count=0
-	while [ "$count" -lt "$UPDATE_RUNS" ]; do
-		apt-get update -qq
-		if [ "$?" = "0" ]; then break; fi
-		sleep $(( $RANDOM % 600 ))
-		count="$(( $count + 1 ))"
-	done
-	if [ "$count" -ge "$UPDATE_RUNS" ]; then
-		(echo "WARNING"
-		 echo "apt-get update failed") > "$STATUS"
-		 exit 1
-	fi
-
-	tmp=`tempfile`
-	trap "rm -f '$tmp'" exit
-	/usr/share/dsa/apt-status-check --noupdate --timeout=600 > "$tmp"
-	result="$?"
-	case "$result" in
-	  0)
-	  	st="OK"
-		;;
-	  1)
-		st="WARNING"
-		;;
-	  2)
-		st="CRITICAL"
-		;;
-	  *)
-		st="UNKNOWN"
-		;;
-	esac
-	(echo "$st"; cat "$tmp") > "$STATUS"
-)&
+[ -x /usr/sbin/dsa-update-apt-status ] && /usr/sbin/dsa-update-apt-status &
diff --git a/dsa-nagios-nrpe-config/debian/rules b/dsa-nagios-nrpe-config/debian/rules
index d870df2..330e129 100755
--- a/dsa-nagios-nrpe-config/debian/rules
+++ b/dsa-nagios-nrpe-config/debian/rules
@@ -28,6 +28,8 @@ install:
 	install -m 755 apt-status-check $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/share/dsa
 	install -m 755 weak-ssh-keys-check $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/share/dsa
 
+	install -m 755 dsa-update-apt-status $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/sbin
+
 
 binary-indep: install
 	dh_testdir
diff --git a/dsa-nagios-nrpe-config/dsa-update-apt-status b/dsa-nagios-nrpe-config/dsa-update-apt-status
new file mode 100755
index 0000000..685f966
--- /dev/null
+++ b/dsa-nagios-nrpe-config/dsa-update-apt-status
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+UPDATE_RUNS=3
+STATUS=/var/cache/dsa/nagios/apt
+
+if [ -z "$TERM" -o "$TERM" = "dumb" ]; then
+	sleep $(( $RANDOM % 7200 ))
+fi
+count=0
+while [ "$count" -lt "$UPDATE_RUNS" ]; do
+	apt-get update -qq
+	if [ "$?" = "0" ]; then break; fi
+	sleep $(( $RANDOM % 600 ))
+	count="$(( $count + 1 ))"
+done
+if [ "$count" -ge "$UPDATE_RUNS" ]; then
+	(echo "WARNING"
+	 echo "apt-get update failed") > "$STATUS"
+	 exit 1
+fi
+
+tmp=`tempfile`
+trap "rm -f '$tmp'" exit
+/usr/share/dsa/apt-status-check --noupdate --timeout=600 > "$tmp"
+result="$?"
+case "$result" in
+  0)
+	st="OK"
+	;;
+  1)
+	st="WARNING"
+	;;
+  2)
+	st="CRITICAL"
+	;;
+  *)
+	st="UNKNOWN"
+	;;
+esac
+(echo "$st"; cat "$tmp") > "$STATUS"
-- 
2.20.1