SliTaz Repositories

     1.1 --- a/nagvis-doc/receipt	Fri May 03 13:11:28 2019 +0100
     1.2 +++ b/nagvis-doc/receipt	Fri May 03 13:39:55 2019 +0100
     1.3 @@ -1,27 +1,26 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagvis-doc"
     1.7 -VERSION="1.5.7"
     1.8 +VERSION="1.9.11"
     1.9  CATEGORY="network"
    1.10 -SHORT_DESC="Nagvis documentation and licence"
    1.11 +SHORT_DESC="Nagvis documentation and licence."
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="http://www.nagvis.org/"
    1.15 -WANTED="nagvis"
    1.16  
    1.17  DEPENDS="nagvis"
    1.18 +WANTED="nagvis"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21  genpkg_rules()
    1.22  {
    1.23 -	mkdir -p $fs/usr/share/doc/nagvis \
    1.24 -		$fs/usr/share/nagvis
    1.25 -	
    1.26 -	# Copy doc and licence
    1.27 -	cp -a  $src/INSTALL $fs/usr/share/doc/nagvis
    1.28 -	cp -a $src/LICENCE $fs/usr/share/doc/nagvis
    1.29 -	cp -a $src/README $fs/usr/share/doc/nagvis
    1.30 -	cp -a $src/ChangeLog $fs/usr/share/doc/nagvis
    1.31 -	cp -pa $src/docs $fs/usr/share/nagvis
    1.32 +	mkdir -p $fs/usr/share/doc/nagvis
    1.33 +	mkdir -p $fs/usr/share/nagvis
    1.34 +
    1.35 +	# Copy documentation and licence
    1.36 +#	cp -a  $src/INSTALL	$fs/usr/share/doc/nagvis
    1.37 +	cp -a $src/COPYING	$fs/usr/share/doc/nagvis
    1.38 +	cp -a $src/README	$fs/usr/share/doc/nagvis
    1.39 +	cp -a $src/ChangeLog	$fs/usr/share/doc/nagvis
    1.40 +	cp -pa $src/docs	$fs/usr/share/nagvis
    1.41  }
    1.42 -

     2.1 --- a/nagvis/receipt	Fri May 03 13:11:28 2019 +0100
     2.2 +++ b/nagvis/receipt	Fri May 03 13:39:55 2019 +0100
     2.3 @@ -1,23 +1,18 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nagvis"
     2.7 -VERSION="1.5.7"
     2.8 +VERSION="1.9.11"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Visualization addon for nagios."
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12  LICENSE="GPL2"
    2.13 +WEB_SITE="http://www.nagvis.org/"
    2.14 +
    2.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.16 -WEB_SITE="http://www.nagvis.org/"
    2.17 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.18 +WGET_URL="${WEB_SITE}share/$TARBALL"
    2.19 +
    2.20  SUGGESTED="graphviz"
    2.21 -
    2.22 -DEPENDS="nagios php-mysql php-gd ndoutils mk-livestatus"
    2.23 -
    2.24 -# Rules to configure and make the package.
    2.25 -compile_rules()
    2.26 -{
    2.27 -	cd $src
    2.28 -}
    2.29 +DEPENDS="mk-livestatus nagios ndoutils php-gd php-mysql"
    2.30  
    2.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.32  genpkg_rules()
    2.33 @@ -28,20 +23,20 @@
    2.34  		$fs/var/lib/nagvis/var/tmpl/compile \
    2.35  		$fs/usr/share/doc/nagvis
    2.36  	
    2.37 -	cp -a $src/share $fs/usr/share/nagvis
    2.38 -	cp -a $src/etc $fs/etc/nagvis
    2.39 +	cp -a $src/share	$fs/usr/share/nagvis
    2.40 +	cp -a $src/etc		$fs/etc/nagvis
    2.41  	
    2.42  	# copy demo maps.
    2.43  	#~ cp $fs/usr/share/nagios/nagvis/nagvis/images/maps/nagvis-demo.png \
    2.44  		#~ $fs/var/lib/nagvis/automap.png
    2.45 -	
    2.46 -	# link  var direcxtory (FHS)	
    2.47 +
    2.48 +	# link  var directory (FHS)	
    2.49  	ln -s /var/lib/nagvis/var  $fs/usr/share/nagvis/var
    2.50 -	
    2.51 -	# move config files
    2.52 +
    2.53 +	# move configuration files
    2.54  	ln -s /etc/nagvis $fs/usr/share/nagvis/etc
    2.55 -	
    2.56 -	# nagvis config
    2.57 +
    2.58 +	# nagvis configuration
    2.59  	mv $fs/etc/nagvis/nagvis.ini.php-sample $fs/etc/nagvis/nagvis.ini.php
    2.60  	sed -i  -e 's|;language=|language=|' \
    2.61  		-e 's|;dateformat="Y-m-d H:i:s"|dateformat="d-m-Y H:i:s"|' \
    2.62 @@ -67,9 +62,9 @@
    2.63  	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' $fs/etc/nagvis/nagvis.ini.php
    2.64  	sed -i -e 's/;showautomaps=1/showautomaps=0/' $fs/etc/nagvis/nagvis.ini.php
    2.65  	
    2.66 -	# Apache config
    2.67 -	mv $fs/etc/nagvis/apache2-nagvis.conf-sample $fs/etc/nagvis/apache2-nagvis.conf
    2.68 -	ln -s /etc/nagvis/apache2-nagvis.conf $fs/etc/apache/conf.d/nagvis.conf
    2.69 +	# Apache configuration
    2.70 +	mv $fs/etc/nagvis/apache2-nagvis.conf-sample	$fs/etc/nagvis/apache2-nagvis.conf
    2.71 +	ln -s /etc/nagvis/apache2-nagvis.conf		$fs/etc/apache/conf.d/nagvis.conf
    2.72  	sed -i -e 's|@NAGVIS_WEB@|/nagvis|' \
    2.73  		-e 's|@NAGVIS_PATH@|/usr/share/nagvis|' \
    2.74  		-e 's|#AuthName|AuthName|' \
    2.75 @@ -78,7 +73,7 @@
    2.76  		-e 's|@NAGIOS_PATH@.*|/etc/nagios/htpasswd.users|' \
    2.77  		-e 's| #Require|Require|' $fs/etc/nagvis/apache2-nagvis.conf
    2.78  	
    2.79 -	# Fix perms
    2.80 +	# Fix permissions
    2.81  	chown -R www.www $fs/usr/share/nagvis $fs/var/lib/nagvis
    2.82  	chown -R root.www $fs/etc/nagvis
    2.83  	
    2.84 @@ -86,7 +81,7 @@
    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 664 $fs/etc/nagvis/automaps/*
    2.90  	chmod 775 $fs/var/lib/nagvis
    2.91  
    2.92  	# Cleanup
    2.93 @@ -97,7 +92,6 @@
    2.94  	chmod 775 $fs/var/lib/nagvis/maps
    2.95  	chmod 664 $fs/var/lib/nagvis/maps/*
    2.96  	ln -s /var/lib/nagvis/maps $fs/usr/share/nagvis/share/userfiles/images/
    2.97 -
    2.98  }
    2.99  
   2.100  post_install()