[debian-edu-commits] debian-edu/ 01/01: Adjust testsuite to match the Icinga2 -> Icinga change.

[Holger Levsen]

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

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

commit 6148f13ef3ce8bb5680230bb06b8bf598758c2f1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jan 17 18:57:21 2017 +0100

    Adjust testsuite to match the Icinga2 -> Icinga change.
---
 debian/changelog  |  4 ++++
 testsuite/icinga  | 20 ++++++++++++++++++++
 testsuite/icinga2 | 24 ------------------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d23328e..c2ee85c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 debian-edu-config (1.922) UNRELEASED; urgency=medium
 
+  [ Wolfgang Schweer ]
   * Adjust web pages to match the Icinga2 -> Icinga change.
 
+  [ Holger Levsen ]
+  * Adjust testsuite to match the Icinga2 -> Icinga change.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 17 Jan 2017 18:33:10 +0100
 
 debian-edu-config (1.921) unstable; urgency=medium
diff --git a/testsuite/icinga b/testsuite/icinga
new file mode 100755
index 0000000..c801821
--- /dev/null
+++ b/testsuite/icinga
@@ -0,0 +1,20 @@
+#!/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/icinga ] ; then
+    echo "success: $0: Found /usr/sbin/icinga binary."
+else
+    echo "error: $0: Missing /usr/sbin/icinga."
+fi
+
+
diff --git a/testsuite/icinga2 b/testsuite/icinga2
deleted file mode 100755
index 11c6cd0..0000000
--- a/testsuite/icinga2
+++ /dev/null
@@ -1,24 +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/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

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