SliTaz Repositories

     1.1 --- a/nagios-dev/receipt	Sat Mar 21 13:41:13 2020 +0100
     1.2 +++ b/nagios-dev/receipt	Sat Mar 21 13:53:08 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios-dev"
     1.7 -VERSION="4.4.3"
     1.8 +VERSION="4.4.5"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Nagios development files."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -14,5 +14,5 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/usr
    1.16 -	cp -pa $src/include $fs/usr
    1.17 +	cp -pa $src/include	$fs/usr
    1.18  }

     2.1 --- a/nagios/receipt	Sat Mar 21 13:41:13 2020 +0100
     2.2 +++ b/nagios/receipt	Sat Mar 21 13:53:08 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nagios"
     2.7 -VERSION="4.4.3"
     2.8 +VERSION="4.4.5"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Host and network monitoring."
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12 @@ -21,7 +21,8 @@
    2.13  {
    2.14  	while read patch_file
    2.15  	 do
    2.16 -		if [ ! -f done.$patch_file ]; then
    2.17 +		if [ ! -f done.$patch_file ]
    2.18 +		  then
    2.19  			patch -p1 < $stuff/$patch_file || return 1
    2.20  			touch done.$patch_file
    2.21  		fi
    2.22 @@ -60,34 +61,37 @@
    2.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.24  genpkg_rules()
    2.25  {
    2.26 -	mkdir -p $fs/usr $fs/etc/init.d \
    2.27 -	  $fs/var/lib/nagios/rw \
    2.28 -	  $fs/var/log/nagios \
    2.29 -	  $fs/var/spool/nagios/checkresults \
    2.30 -	  $fs/etc/apache
    2.31 +	mkdir -p $fs/usr $fs/etc/init.d
    2.32 +	mkdir -p $fs/var/lib/nagios/rw
    2.33 +	mkdir -p $fs/var/log/nagios
    2.34 +	mkdir -p $fs/var/spool/nagios/checkresults
    2.35 +	mkdir -p $fs/etc/apache
    2.36  		
    2.37  	cp -a $install/etc/apache	$fs/etc
    2.38  	cp -a $install/etc/nagios	$fs/etc
    2.39  	cp -a $stuff/nagios		$fs/etc/init.d
    2.40 -	install -o root -g root -m 644 $stuff/htpasswd.users  $fs/etc/nagios/
    2.41 +	install -o root -g root -m 644 $stuff/htpasswd.users \
    2.42 +					$fs/etc/nagios/
    2.43  	
    2.44  	cp -a $install/usr/bin		$fs/usr
    2.45  	cp -a $install/usr/lib		$fs/usr
    2.46  	cp -a $install/usr/share	$fs/usr
    2.47  	
    2.48  	# Put documentation in a separate package
    2.49 -	rm -rf $fs/usr/share/nagios/docs
    2.50 +	rm -rf				$fs/usr/share/nagios/docs
    2.51  	
    2.52 -	# Mofify Apache config for nagvis
    2.53 -	sed -i 's/Options None/Options FollowSymLinks/' $fs/etc/apache/conf.d/nagios.conf
    2.54 +	# Mofify Apache configuration for nagvis
    2.55 +	sed -i 's/Options None/Options FollowSymLinks/' \
    2.56 +		$fs/etc/apache/conf.d/nagios.conf
    2.57  
    2.58  	# Fix permissions 
    2.59 -	chmod 755 $fs/usr/bin/nagios*
    2.60 +	chmod 755			$fs/usr/bin/nagios*
    2.61  }
    2.62  
    2.63  post_install()
    2.64  {
    2.65 -	if ! grep -q nagios "$1/etc/passwd"; then
    2.66 +	if ! grep -q nagios "$1/etc/passwd"
    2.67 +	  then
    2.68  		echo -n "Adding user/group nagios..."
    2.69  		chroot "$1/" addgroup -S nagios
    2.70  		chroot "$1/" adduser -S -D -H -G nagios nagios
    2.71 @@ -95,12 +99,12 @@
    2.72  	fi
    2.73  	
    2.74  	# Fix permissions for files and directories
    2.75 -	chroot "$1/" chown -R nagios.nagios \
    2.76 -	  /var/log/nagios	\
    2.77 -	  /var/spool/nagios	\
    2.78 -	  /var/lib/nagios	\
    2.79 -	  /usr/share/nagios	\
    2.80 -	  /etc/nagios/*
    2.81 +	chroot "$1/" chown -R	nagios.nagios		\
    2.82 +				/var/log/nagios		\
    2.83 +				/var/spool/nagios	\
    2.84 +				/var/lib/nagios		\
    2.85 +				/usr/share/nagios	\
    2.86 +				/etc/nagios/*
    2.87  	
    2.88  	chmod 2775 "$1/var/lib/nagios/rw"
    2.89  	chroot "$1/" addgroup www nagios