[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 aecb93e5365eb8c6064d33a02fe187ca9d4069fa
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Fri Jan 6 08:05:31 2012 +0100

    Added support for nagios-plugins installation for redhat/centos (only tested on 6 branch)

diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index 3602215..670bee4 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -97,6 +97,8 @@ export CHECK_ESX3_SCRIPT="http://git.op5.org/git/?p=nagios/op5plugins.git;a=blob
 export NAGPLUGVERS="1.4.15"
 export NAGPLUGBASEURI="http://downloads.sourceforge.net/project/nagiosplug/nagiosplug/$NAGPLUGVERS/nagios-plugins-$NAGPLUGVERS.tar.gz"
 export NAGPLUGAPTPKG="libgnutls-dev libmysqlclient-dev libssl-dev libsnmp-perl libkrb5-dev libldap2-dev libsnmp-dev libnet-snmp-perl gawk libwrap0-dev libmcrypt-dev fping snmp gettext smbclient dnsutils"
+export NAGPLUGYUMPKG="gnutls-devel mysql-devel openssl-devel net-snmp-perl krb5-devel openldap-devel net-snmp-devel gawk libmcrypt-devel fping net-snmp gettext samba-client"
+
 
 export CHECKORACLEHEALTHAPTPKG="libdbi-perl libaio1"
 export CHECKORACLEHEALTHCPAN="http://search.cpan.org/CPAN/authors/id/P/PY/PYTHIAN/DBD-Oracle-1.36.tar.gz"
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 8e460a0..84bb252 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -724,7 +724,7 @@ function prerequisites(){
 	case $CODE in
 		REDHAT)
 			case $VERS in
-				5)
+				[5-6])
 					PACKAGES=$YUMPKGS
 					QUERY="rpm -q "
 					cd $TMP
@@ -743,10 +743,10 @@ function prerequisites(){
 						cecho " > $EPELPKG allready installed" green 
 					fi
 					;;
-				6)
-					PACKAGES=$YUMPKGS
-					QUERY="rpm -q "
-					;;
+#				6)
+#					PACKAGES=$YUMPKGS
+#					QUERY="rpm -q "
+#					;;
 				*)
 					cecho " > Unsupported RedHat/CentOs version" red
 					exit 2
@@ -1255,7 +1255,8 @@ function install_nagios-plugins(){
 
 	if [ "$CODE" == "REDHAT" ]
 	then
-		cecho " > Unsuported" red
+		cecho " > installing prerequisites" green
+		yum install -yq $NAGPLUGYUMPKG  > /dev/null 2>&1
 	else
 		cecho " > installing prerequisites" green 
 		sudo apt-get -y install $NAGPLUGAPTPKG > /dev/null 2>&1
@@ -1271,6 +1272,7 @@ function install_nagios-plugins(){
 	tar zxvf nagios-plugins-$NAGPLUGVERS.tar.gz > /dev/null 2>&1
 	cd nagios-plugins-$NAGPLUGVERS
 	cecho " > Configure source tree" green
+	echo "./configure --with-nagios-user=$SKUSER --with-nagios-group=$SKGROUP --enable-libtap --enable-extra-opts --prefix=$TARGET" > /dev/null 2>&1
 	./configure --with-nagios-user=$SKUSER --with-nagios-group=$SKGROUP --enable-libtap --enable-extra-opts --prefix=$TARGET > /dev/null 2>&1
 	cecho " > Building ...." green
 	make > /dev/null 2>&1

-- 
UNNAMED PROJECT