SliTaz Repositories

     1.1 --- a/nagvis-doc/receipt	Sat Mar 21 14:54:51 2020 +0100
     1.2 +++ b/nagvis-doc/receipt	Sat Mar 21 15:07:17 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagvis-doc"
     1.7 -VERSION="1.9.11"
     1.8 +VERSION="1.9.18"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Nagvis documentation and licence."
    1.11  MAINTAINER="erjo@slitaz.org"

     2.1 --- a/nagvis/receipt	Sat Mar 21 14:54:51 2020 +0100
     2.2 +++ b/nagvis/receipt	Sat Mar 21 15:07:17 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nagvis"
     2.7 -VERSION="1.9.11"
     2.8 +VERSION="1.9.18"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Visualization addon for nagios."
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12 @@ -17,11 +17,11 @@
    2.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.14  genpkg_rules()
    2.15  {
    2.16 -	mkdir -p $fs/usr/share/nagvis \
    2.17 -		$fs/etc/apache/conf.d \
    2.18 -		$fs/var/lib/nagvis/var/tmpl/cache \
    2.19 -		$fs/var/lib/nagvis/var/tmpl/compile \
    2.20 -		$fs/usr/share/doc/nagvis
    2.21 +	mkdir -p $fs/usr/share/nagvis
    2.22 +	mkdir -p $fs/etc/apache/conf.d
    2.23 +	mkdir -p $fs/var/lib/nagvis/var/tmpl/cache
    2.24 +	mkdir -p $fs/var/lib/nagvis/var/tmpl/compile
    2.25 +	mkdir -p $fs/usr/share/doc/nagvis
    2.26  	
    2.27  	cp -a $src/share	$fs/usr/share/nagvis
    2.28  	cp -a $src/etc		$fs/etc/nagvis
    2.29 @@ -30,11 +30,11 @@
    2.30  	#~ cp $fs/usr/share/nagios/nagvis/nagvis/images/maps/nagvis-demo.png \
    2.31  		#~ $fs/var/lib/nagvis/automap.png
    2.32  
    2.33 -	# link  var directory (FHS)	
    2.34 +	# link var directory (FHS)	
    2.35  	ln -s /var/lib/nagvis/var  $fs/usr/share/nagvis/var
    2.36  
    2.37  	# move configuration files
    2.38 -	ln -s /etc/nagvis $fs/usr/share/nagvis/etc
    2.39 +	ln -s /etc/nagvis	$fs/usr/share/nagvis/etc
    2.40  
    2.41  	# nagvis configuration
    2.42  	mv $fs/etc/nagvis/nagvis.ini.php-sample $fs/etc/nagvis/nagvis.ini.php
    2.43 @@ -59,39 +59,47 @@
    2.44  logonenvvar="REMOTE_USER"\
    2.45  logonenvcreateuser="0"
    2.46  	}' $fs/etc/nagvis/nagvis.ini.php
    2.47 -	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' $fs/etc/nagvis/nagvis.ini.php
    2.48 -	sed -i -e 's/;showautomaps=1/showautomaps=0/' $fs/etc/nagvis/nagvis.ini.php
    2.49 +	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' \
    2.50 +		$fs/etc/nagvis/nagvis.ini.php
    2.51 +	sed -i -e 's/;showautomaps=1/showautomaps=0/' \
    2.52 +		$fs/etc/nagvis/nagvis.ini.php
    2.53  	
    2.54  	# Apache configuration
    2.55 -	mv $fs/etc/nagvis/apache2-nagvis.conf-sample	$fs/etc/nagvis/apache2-nagvis.conf
    2.56 -	ln -s /etc/nagvis/apache2-nagvis.conf		$fs/etc/apache/conf.d/nagvis.conf
    2.57 +	mv $fs/etc/nagvis/apache2-nagvis.conf-sample \
    2.58 +			$fs/etc/nagvis/apache2-nagvis.conf
    2.59 +	ln -s /etc/nagvis/apache2-nagvis.conf \
    2.60 +			$fs/etc/apache/conf.d/nagvis.conf
    2.61  	sed -i -e 's|@NAGVIS_WEB@|/nagvis|' \
    2.62  		-e 's|@NAGVIS_PATH@|/usr/share/nagvis|' \
    2.63  		-e 's|#AuthName|AuthName|' \
    2.64  		-e 's|#AuthType|AuthType|' \
    2.65  		-e 's|#AuthUserFile|AuthUserFile|' \
    2.66  		-e 's|@NAGIOS_PATH@.*|/etc/nagios/htpasswd.users|' \
    2.67 -		-e 's| #Require|Require|' $fs/etc/nagvis/apache2-nagvis.conf
    2.68 +		-e 's| #Require|Require|' \
    2.69 +		$fs/etc/nagvis/apache2-nagvis.conf
    2.70  	
    2.71  	# Fix permissions
    2.72 -	chown -R www.www $fs/usr/share/nagvis $fs/var/lib/nagvis
    2.73 -	chown -R root.www $fs/etc/nagvis
    2.74 +	chown -R www.www	$fs/usr/share/nagvis
    2.75 +	chown -R www.www	$fs/var/lib/nagvis
    2.76 +	chown -R root.www	$fs/etc/nagvis
    2.77  	
    2.78 -	chmod 664 $fs/etc/nagvis/nagvis.ini.php  
    2.79 -	chmod 775 $fs/etc/nagvis/maps
    2.80 -	chmod 664 $fs/etc/nagvis/maps/*
    2.81 -	chmod 664 $fs/etc/nagvis/geomap/*
    2.82 -#	chmod 664 $fs/etc/nagvis/automaps/*
    2.83 -	chmod 775 $fs/var/lib/nagvis
    2.84 +	chmod 664		$fs/etc/nagvis/nagvis.ini.php  
    2.85 +	chmod 775		$fs/etc/nagvis/maps
    2.86 +	chmod 664		$fs/etc/nagvis/maps/*
    2.87 +	chmod 664		$fs/etc/nagvis/geomap/*
    2.88 +#	chmod 664		$fs/etc/nagvis/automaps/*
    2.89 +	chmod 775		$fs/var/lib/nagvis
    2.90  
    2.91  	# Cleanup
    2.92 -	rm -f $fs/usr/share/nagvis/install.*
    2.93 -	rm -f $fs/usr/share/nagvis/share/uifx
    2.94 +	rm -f			$fs/usr/share/nagvis/install.*
    2.95 +	rm -f			$fs/usr/share/nagvis/share/uifx
    2.96  	
    2.97 -	mv $fs/usr/share/nagvis/share/userfiles/images/maps $fs/var/lib/nagvis
    2.98 -	chmod 775 $fs/var/lib/nagvis/maps
    2.99 -	chmod 664 $fs/var/lib/nagvis/maps/*
   2.100 -	ln -s /var/lib/nagvis/maps $fs/usr/share/nagvis/share/userfiles/images/
   2.101 +	mv $fs/usr/share/nagvis/share/userfiles/images/maps \
   2.102 +				$fs/var/lib/nagvis
   2.103 +	chmod 775		$fs/var/lib/nagvis/maps
   2.104 +	chmod 664		$fs/var/lib/nagvis/maps/*
   2.105 +	ln -s /var/lib/nagvis/maps \
   2.106 +				$fs/usr/share/nagvis/share/userfiles/images/
   2.107  }
   2.108  
   2.109  post_install()
   2.110 @@ -99,7 +107,8 @@
   2.111  	cat <<EOT
   2.112  Now visit http://localhost/nagvis
   2.113  EOT
   2.114 -	if [ -z "$1" ]; then
   2.115 +	if [ -z "$1" ]
   2.116 +	  then
   2.117  		/etc/init.d/nagios stop
   2.118  		/etc/init.d/nagios start
   2.119  	fi