Open Build Service

Changes of Revision 43

jsj-installtools.changes Changed

PrepareNagiosTests Changed

@@ -1,15 +1,17 @@
 #!/bin/bash
-if  -f /etc/SuSE-release ; then
+if  -f /etc/os-release ; then
+  VERSION=$(egrep VERSION_ID /etc/os-release | cut -f2 -d= | tr -d " \"")
+elif  -f /etc/SuSE-release ; then
   VERSION=$(egrep VERSION /etc/SuSE-release | cut -f2 -d= | tr -d " ")
 else
-  echo No file /etc/SuSE-release available. Stop.
+  echo No file /etc/os-release or /etc/SuSE-release available. Stop.
   exit 1
 fi
 zypper sl -u | egrep "jsj/openSUSE_$VERSION" 2>&1 > /dev/null
 if  $? != 0 ; then
   zypper ar -t  rpm-md -f http://repo.jacobs-university.de/jsj/openSUSE_$VERSION  "jsj_$VERSION"
 fi
-zypper -n in -l nrpe nagios-plugins-zypper nagios-plugins-kernel check_mk-agent rdiff-backup
+zypper -n in -l nrpe monitoring-plugins-zypper nagios-plugins-kernel check_mk-agent rdiff-backup
 rsync -vaPH nagios.jacobs-university.de::nagios/ /etc/nagios/
 if  ${VERSION%%.*} -ge 12 ; then
   sed -e '/pid_file/ s/pid_file=.*/pid_file=\/var\/run\/nrpe\/nrpe.pid/' < /etc/nagios/nrpe.cfg > /etc/nagios/nrpe.cfg.new