wok diff nagvis/receipt @ rev 21937

Up nnn (2.7)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Oct 07 18:30:01 2019 +0200 (2019-10-07)
parents 3765f181a6d5
children 250d88727567
line diff
     1.1 --- a/nagvis/receipt	Sat Nov 30 17:02:58 2013 +0000
     1.2 +++ b/nagvis/receipt	Mon Oct 07 18:30:01 2019 +0200
     1.3 @@ -1,23 +1,18 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagvis"
     1.7 -VERSION="1.5.7"
     1.8 +VERSION="1.9.11"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Visualization addon for nagios."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 +WEB_SITE="http://www.nagvis.org/"
    1.14 +
    1.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.16 -WEB_SITE="http://www.nagvis.org/"
    1.17 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.18 +WGET_URL="${WEB_SITE}share/$TARBALL"
    1.19 +
    1.20  SUGGESTED="graphviz"
    1.21 -
    1.22 -DEPENDS="nagios php-mysql php-gd ndoutils mk-livestatus"
    1.23 -
    1.24 -# Rules to configure and make the package.
    1.25 -compile_rules()
    1.26 -{
    1.27 -	cd $src
    1.28 -}
    1.29 +DEPENDS="mk-livestatus nagios ndoutils php-gd php-mysql"
    1.30  
    1.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.32  genpkg_rules()
    1.33 @@ -28,20 +23,20 @@
    1.34  		$fs/var/lib/nagvis/var/tmpl/compile \
    1.35  		$fs/usr/share/doc/nagvis
    1.36  	
    1.37 -	cp -a $src/share $fs/usr/share/nagvis
    1.38 -	cp -a $src/etc $fs/etc/nagvis
    1.39 +	cp -a $src/share	$fs/usr/share/nagvis
    1.40 +	cp -a $src/etc		$fs/etc/nagvis
    1.41  	
    1.42  	# copy demo maps.
    1.43  	#~ cp $fs/usr/share/nagios/nagvis/nagvis/images/maps/nagvis-demo.png \
    1.44  		#~ $fs/var/lib/nagvis/automap.png
    1.45 -	
    1.46 -	# link  var direcxtory (FHS)	
    1.47 +
    1.48 +	# link  var directory (FHS)	
    1.49  	ln -s /var/lib/nagvis/var  $fs/usr/share/nagvis/var
    1.50 -	
    1.51 -	# move config files
    1.52 +
    1.53 +	# move configuration files
    1.54  	ln -s /etc/nagvis $fs/usr/share/nagvis/etc
    1.55 -	
    1.56 -	# nagvis config
    1.57 +
    1.58 +	# nagvis configuration
    1.59  	mv $fs/etc/nagvis/nagvis.ini.php-sample $fs/etc/nagvis/nagvis.ini.php
    1.60  	sed -i  -e 's|;language=|language=|' \
    1.61  		-e 's|;dateformat="Y-m-d H:i:s"|dateformat="d-m-Y H:i:s"|' \
    1.62 @@ -67,9 +62,9 @@
    1.63  	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' $fs/etc/nagvis/nagvis.ini.php
    1.64  	sed -i -e 's/;showautomaps=1/showautomaps=0/' $fs/etc/nagvis/nagvis.ini.php
    1.65  	
    1.66 -	# Apache config
    1.67 -	mv $fs/etc/nagvis/apache2-nagvis.conf-sample $fs/etc/nagvis/apache2-nagvis.conf
    1.68 -	ln -s /etc/nagvis/apache2-nagvis.conf $fs/etc/apache/conf.d/nagvis.conf
    1.69 +	# Apache configuration
    1.70 +	mv $fs/etc/nagvis/apache2-nagvis.conf-sample	$fs/etc/nagvis/apache2-nagvis.conf
    1.71 +	ln -s /etc/nagvis/apache2-nagvis.conf		$fs/etc/apache/conf.d/nagvis.conf
    1.72  	sed -i -e 's|@NAGVIS_WEB@|/nagvis|' \
    1.73  		-e 's|@NAGVIS_PATH@|/usr/share/nagvis|' \
    1.74  		-e 's|#AuthName|AuthName|' \
    1.75 @@ -78,7 +73,7 @@
    1.76  		-e 's|@NAGIOS_PATH@.*|/etc/nagios/htpasswd.users|' \
    1.77  		-e 's| #Require|Require|' $fs/etc/nagvis/apache2-nagvis.conf
    1.78  	
    1.79 -	# Fix perms
    1.80 +	# Fix permissions
    1.81  	chown -R www.www $fs/usr/share/nagvis $fs/var/lib/nagvis
    1.82  	chown -R root.www $fs/etc/nagvis
    1.83  	
    1.84 @@ -86,7 +81,7 @@
    1.85  	chmod 775 $fs/etc/nagvis/maps
    1.86  	chmod 664 $fs/etc/nagvis/maps/*
    1.87  	chmod 664 $fs/etc/nagvis/geomap/*
    1.88 -	chmod 664 $fs/etc/nagvis/automaps/*
    1.89 +#	chmod 664 $fs/etc/nagvis/automaps/*
    1.90  	chmod 775 $fs/var/lib/nagvis
    1.91  
    1.92  	# Cleanup
    1.93 @@ -97,7 +92,6 @@
    1.94  	chmod 775 $fs/var/lib/nagvis/maps
    1.95  	chmod 664 $fs/var/lib/nagvis/maps/*
    1.96  	ln -s /var/lib/nagvis/maps $fs/usr/share/nagvis/share/userfiles/images/
    1.97 -
    1.98  }
    1.99  
   1.100  post_install()