[debian-edu-commits] debian-edu/ 02/02: testsuite: Drop nagios test, add one for icinga2.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 6764457cc8019ce8aa08c9510ad9b8c805f00d5e
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Aug 23 15:43:49 2016 +0200

    testsuite: Drop nagios test, add one for icinga2.
    
    Testing if icinga2 and icinga2-classicui are available.
    There seems to be no equivatent available for nagios3stats, so
    skipping the host number test.
---
 debian/changelog  |  1 +
 testsuite/icinga2 | 24 ++++++++++++++++++++++++
 testsuite/nagios  | 31 -------------------------------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a77a471..1f7616d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ debian-edu-config (1.909) UNRELEASED; urgency=medium
   * Adjust www/index.html.en to reflect the replacement of nagios3 with
     icinga2-classicui.
   * Update files below /www after running 'make'.
+  * testsuite: Drop nagios test, add one for icinga2.
 
   [ Translation updates for index.html ]
   * German (and all other languages) by Wolfgang Schweer.
diff --git a/testsuite/icinga2 b/testsuite/icinga2
new file mode 100755
index 0000000..11c6cd0
--- /dev/null
+++ b/testsuite/icinga2
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if test -r /etc/debian-edu/config ; then
+    . /etc/debian-edu/config
+fi
+
+# Only Main-Server got Nagios running
+if echo "$PROFILE" | grep -q Main-Server ; then
+    :
+else
+    exit 0
+fi
+
+if [ -x /usr/sbin/icinga2 ] ; then
+    echo "success: $0: Found /usr/sbin/icinga2 binary."
+else
+    echo "error: $0: Missing /usr/sbin/icinga2."
+fi
+
+if [ -e /etc/icinga2-classicui/apache2.conf ] ; then
+    echo "success: $0: Found icinga2-classicui/apache2.conf."
+else
+    echo "error: $0: Missing package icinga2-classicui."
+fi
diff --git a/testsuite/nagios b/testsuite/nagios
deleted file mode 100755
index ef3cc8a..0000000
--- a/testsuite/nagios
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-if test -r /etc/debian-edu/config ; then
-    . /etc/debian-edu/config
-fi
-
-# Only Main-Server got Nagios running
-if echo "$PROFILE" | grep -q Main-Server ; then
-    :
-else
-    exit 0
-fi
-
-if [ -x /usr/sbin/nagios3 ] ; then
-    echo "success: $0: Found /usr/sbin/nagios3 binary."
-else
-    echo "error: $0: Missing /usr/sbin/nagios3."
-fi
-
-if [ -x /usr/sbin/nagios3stats ] ; then
-    for field in NUMSVCCRIT NUMSVCWARN NUMSVCUNKN; do
-	count="$(nagios3stats -m -d$field)"
-	if [ 0 = "$count" ] ; then
-	    echo "success: $0: Nagios count $field is zero."
-	else
-	    echo "error: $0: Nagios count $field is not zero but $count."
-	fi
-    done
-else
-    echo "error: $0: Missing /usr/sbin/nagios3stats."
-fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git