[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit 372bc47c29a96a031c8a75e5112a66f844244a2b
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Jan 8 10:27:53 2012 +0100

    FIX missing dependency on redhat/centos for check_mysql_health installation

diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index dadd8f0..b826b46 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -114,6 +114,7 @@ export CHECKORACLEHEALTHCPAN="http://search.cpan.org/CPAN/authors/id/P/PY/PYTHIA
 export CHECKORACLEHEALTH="http://labs.consol.de/wp-content/uploads/2011/09/check_oracle_health-1.7.3.tar.gz"
 
 export CHECKMYSQLHEALTH="http://labs.consol.de/wp-content/uploads/2011/08/check_mysql_health-2.1.7.tar.gz"
+export CHECKMYSQLHEALTHYUMPKG="perl-Time-HiRes"
 
 export PNPBRANCH="0.6"
 export PNPRELEASE="16"
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index e732d85..28987a4 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -1459,37 +1459,40 @@ function install_check_mysql_health(){
 
 	if [ "$CODE" == "REDHAT" ]
 	then
-		cecho " > Unsuported" red
+		cecho " > Installing prerequisites" green
+		yum -yq install $CHECKMYSQLHEALTHYUMPKG >> /tmp/shinken.install.log
 	else
-		cd /tmp
-		cecho " > Downloading check_mysql_health" green
-		wget $WGETPROXY $CHECKMYSQLHEALTH >> /tmp/shinken.install.log 2>&1 
-		if [ $? -ne 0 ]
-		then
-			cecho " > Error while downloading $filename" red
-			exit 2
-		fi
-		cecho " > Extracting archive " green
-		filename=$(echo $CHECKMYSQLHEALTH | awk -F"/" '{print $NF}')
-		tar zxvf $filename >> /tmp/shinken.install.log 2>&1 
-		cd $(echo $filename | sed -e "s/\.tar\.gz//g")
-		./configure --prefix=$TARGET --with-nagios-user=$SKUSER --with-nagios-group=$SKGROUP --with-mymodules-dir=$TARGET/libexec --with-mymodules-dyn-dir=$TARGET/libexec --with-statefiles-dir=$TARGET/var/tmp >> /tmp/shinken.install.log 2>&1 
-		cecho " > Building plugin" green
-		make >> /tmp/shinken.install.log 2>&1 
-		if [ $? -ne 0 ] 
-		then
-			cecho " > Error while building check_mysql_health module" red
-			exit 2
-		fi
-		make check >> /tmp/shinken.install.log 2>&1 	
-		if [ $? -ne 0 ]
-		then
-			cecho " > Error while building check_mysql_health module" red
-			exit 2
-		fi
-		cecho " > Installing plugin" green
-		make install >> /tmp/shinken.install.log 2>&1 
+		cecho " > Installing prerequisites" green
+		yum -yq install $CHECKMYSQLHEALTHAPTPKG >> /tmp/shinken.install.log
+	fi
+	cd /tmp
+	cecho " > Downloading check_mysql_health" green
+	wget $WGETPROXY $CHECKMYSQLHEALTH >> /tmp/shinken.install.log 2>&1 
+	if [ $? -ne 0 ]
+	then
+		cecho " > Error while downloading $filename" red
+		exit 2
 	fi
+	cecho " > Extracting archive " green
+	filename=$(echo $CHECKMYSQLHEALTH | awk -F"/" '{print $NF}')
+	tar zxvf $filename >> /tmp/shinken.install.log 2>&1 
+	cd $(echo $filename | sed -e "s/\.tar\.gz//g")
+	./configure --prefix=$TARGET --with-nagios-user=$SKUSER --with-nagios-group=$SKGROUP --with-mymodules-dir=$TARGET/libexec --with-mymodules-dyn-dir=$TARGET/libexec --with-statefiles-dir=$TARGET/var/tmp >> /tmp/shinken.install.log 2>&1 
+	cecho " > Building plugin" green
+	make >> /tmp/shinken.install.log 2>&1 
+	if [ $? -ne 0 ] 
+	then
+		cecho " > Error while building check_mysql_health module" red
+		exit 2
+	fi
+	make check >> /tmp/shinken.install.log 2>&1 	
+	if [ $? -ne 0 ]
+	then
+		cecho " > Error while building check_mysql_health module" red
+		exit 2
+	fi
+	cecho " > Installing plugin" green
+	make install >> /tmp/shinken.install.log 2>&1 
 }
 
 # Check if we launch the script with root privileges (aka sudo)

-- 
UNNAMED PROJECT