wok-6.x rev 23213

updated nagios-plugins and nagios-plugins-mysql (2.2.1 -> 2.3.3)
author Hans-G?nter Theisgen
date Sat Mar 21 14:54:51 2020 +0100 (2020-03-21)
parents f3fb994aac6d
children 250d88727567
files nagios-plugins-mysql/receipt nagios-plugins/receipt
line diff
     1.1 --- a/nagios-plugins-mysql/receipt	Sat Mar 21 14:45:16 2020 +0100
     1.2 +++ b/nagios-plugins-mysql/receipt	Sat Mar 21 14:54:51 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios-plugins-mysql"
     1.7 -VERSION="2.2.1"
     1.8 +VERSION="2.3.3"
     1.9  CATEGORY="meta"
    1.10  SHORT_DESC="Dependencies for Nagios MySQL plugin."
    1.11  MAINTAINER="erjo@slitaz.org"
     2.1 --- a/nagios-plugins/receipt	Sat Mar 21 14:45:16 2020 +0100
     2.2 +++ b/nagios-plugins/receipt	Sat Mar 21 14:54:51 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nagios-plugins"
     2.7 -VERSION="2.2.1"
     2.8 +VERSION="2.3.3"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Plugins for host, service and network monitoring program nagios."
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12 @@ -26,7 +26,7 @@
    2.13  		--with-ping-command="/bin/ping -w %d -c %d %s"	\
    2.14  		--with-fping-command="/usr/sbin/fping"		\
    2.15  		--mandir=/usr/share/man				\
    2.16 -		$CONFIGURE_ARGS
    2.17 +		$CONFIGURE_ARGS &&
    2.18  	make &&
    2.19  	make DESTDIR=$DESTDIR install &&
    2.20  	make DESTDIR=$DESTDIR install-root
    2.21 @@ -38,18 +38,19 @@
    2.22  	mkdir -p $fs/usr/lib
    2.23  	mkdir -p $fs/etc/nagios/objects
    2.24  
    2.25 -	cp -a $install/usr/lib/nagios/ $fs/usr/lib
    2.26 +	cp -a $install/usr/lib/nagios	$fs/usr/lib
    2.27  
    2.28  	# 
    2.29  	stuff/convertcfg $src/command.cfg commands > $fs/etc/nagios/objects/command.cfg
    2.30  	
    2.31  	# Move mySQL plugins in a separate package.
    2.32 -	rm -f $fs/usr/lib/nagios/plugins/*mysql*
    2.33 +	rm -f				$fs/usr/lib/nagios/plugins/*mysql*
    2.34  }
    2.35  
    2.36  post_install()
    2.37  {
    2.38 -	if ! grep -q nagios "$1/etc/passwd"; then
    2.39 +	if ! grep -q nagios "$1/etc/passwd"
    2.40 +	  then
    2.41  		echo
    2.42  		echo -n "Adding user/group nagios..."
    2.43  		chroot "$1/" addgroup -S nagios
    2.44 @@ -57,12 +58,13 @@
    2.45  		status
    2.46  	fi
    2.47  	
    2.48 -	if [ -f "$1/etc/nagios/resource.cfg" ]; then
    2.49 +	if [ -f "$1/etc/nagios/resource.cfg" ]
    2.50 +	  then
    2.51  		sed -i 's|/usr/lib/nagios|/usr/lib/nagios/plugins|' \
    2.52  		   "$1/etc/nagios/resource.cfg"
    2.53  	fi
    2.54  
    2.55  	# Set permissions for files and directories
    2.56 -	chroot "$1/" chown -R nagios.nagios /usr/lib/nagios/plugins 
    2.57 -	chroot "$1/" chown -R nagios.nagios /etc/nagios/objects
    2.58 +	chroot "$1/" chown -R nagios.nagios	/usr/lib/nagios/plugins 
    2.59 +	chroot "$1/" chown -R nagios.nagios	/etc/nagios/objects
    2.60  }