# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1584799637 -3600
# Node ID 250d88727567ee9a7da73577592a7d066067b4b5
# Parent  39e11db3ea78a9f84f85771f67c518dcf0a9a7d6
updated nagvis and  nagvis-doc (1.9.11 -> 1.9.18)

diff -r 39e11db3ea78 -r 250d88727567 nagvis-doc/receipt
--- a/nagvis-doc/receipt	Sat Mar 21 14:54:51 2020 +0100
+++ b/nagvis-doc/receipt	Sat Mar 21 15:07:17 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagvis-doc"
-VERSION="1.9.11"
+VERSION="1.9.18"
 CATEGORY="network"
 SHORT_DESC="Nagvis documentation and licence."
 MAINTAINER="erjo@slitaz.org"
diff -r 39e11db3ea78 -r 250d88727567 nagvis/receipt
--- a/nagvis/receipt	Sat Mar 21 14:54:51 2020 +0100
+++ b/nagvis/receipt	Sat Mar 21 15:07:17 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagvis"
-VERSION="1.9.11"
+VERSION="1.9.18"
 CATEGORY="network"
 SHORT_DESC="Visualization addon for nagios."
 MAINTAINER="erjo@slitaz.org"
@@ -17,11 +17,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share/nagvis \
-		$fs/etc/apache/conf.d \
-		$fs/var/lib/nagvis/var/tmpl/cache \
-		$fs/var/lib/nagvis/var/tmpl/compile \
-		$fs/usr/share/doc/nagvis
+	mkdir -p $fs/usr/share/nagvis
+	mkdir -p $fs/etc/apache/conf.d
+	mkdir -p $fs/var/lib/nagvis/var/tmpl/cache
+	mkdir -p $fs/var/lib/nagvis/var/tmpl/compile
+	mkdir -p $fs/usr/share/doc/nagvis
 	
 	cp -a $src/share	$fs/usr/share/nagvis
 	cp -a $src/etc		$fs/etc/nagvis
@@ -30,11 +30,11 @@
 	#~ cp $fs/usr/share/nagios/nagvis/nagvis/images/maps/nagvis-demo.png \
 		#~ $fs/var/lib/nagvis/automap.png
 
-	# link  var directory (FHS)	
+	# link var directory (FHS)	
 	ln -s /var/lib/nagvis/var  $fs/usr/share/nagvis/var
 
 	# move configuration files
-	ln -s /etc/nagvis $fs/usr/share/nagvis/etc
+	ln -s /etc/nagvis	$fs/usr/share/nagvis/etc
 
 	# nagvis configuration
 	mv $fs/etc/nagvis/nagvis.ini.php-sample $fs/etc/nagvis/nagvis.ini.php
@@ -59,39 +59,47 @@
 logonenvvar="REMOTE_USER"\
 logonenvcreateuser="0"
 	}' $fs/etc/nagvis/nagvis.ini.php
-	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' $fs/etc/nagvis/nagvis.ini.php
-	sed -i -e 's/;showautomaps=1/showautomaps=0/' $fs/etc/nagvis/nagvis.ini.php
+	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' \
+		$fs/etc/nagvis/nagvis.ini.php
+	sed -i -e 's/;showautomaps=1/showautomaps=0/' \
+		$fs/etc/nagvis/nagvis.ini.php
 	
 	# Apache configuration
-	mv $fs/etc/nagvis/apache2-nagvis.conf-sample	$fs/etc/nagvis/apache2-nagvis.conf
-	ln -s /etc/nagvis/apache2-nagvis.conf		$fs/etc/apache/conf.d/nagvis.conf
+	mv $fs/etc/nagvis/apache2-nagvis.conf-sample \
+			$fs/etc/nagvis/apache2-nagvis.conf
+	ln -s /etc/nagvis/apache2-nagvis.conf \
+			$fs/etc/apache/conf.d/nagvis.conf
 	sed -i -e 's|@NAGVIS_WEB@|/nagvis|' \
 		-e 's|@NAGVIS_PATH@|/usr/share/nagvis|' \
 		-e 's|#AuthName|AuthName|' \
 		-e 's|#AuthType|AuthType|' \
 		-e 's|#AuthUserFile|AuthUserFile|' \
 		-e 's|@NAGIOS_PATH@.*|/etc/nagios/htpasswd.users|' \
-		-e 's| #Require|Require|' $fs/etc/nagvis/apache2-nagvis.conf
+		-e 's| #Require|Require|' \
+		$fs/etc/nagvis/apache2-nagvis.conf
 	
 	# Fix permissions
-	chown -R www.www $fs/usr/share/nagvis $fs/var/lib/nagvis
-	chown -R root.www $fs/etc/nagvis
+	chown -R www.www	$fs/usr/share/nagvis
+	chown -R www.www	$fs/var/lib/nagvis
+	chown -R root.www	$fs/etc/nagvis
 	
-	chmod 664 $fs/etc/nagvis/nagvis.ini.php  
-	chmod 775 $fs/etc/nagvis/maps
-	chmod 664 $fs/etc/nagvis/maps/*
-	chmod 664 $fs/etc/nagvis/geomap/*
-#	chmod 664 $fs/etc/nagvis/automaps/*
-	chmod 775 $fs/var/lib/nagvis
+	chmod 664		$fs/etc/nagvis/nagvis.ini.php  
+	chmod 775		$fs/etc/nagvis/maps
+	chmod 664		$fs/etc/nagvis/maps/*
+	chmod 664		$fs/etc/nagvis/geomap/*
+#	chmod 664		$fs/etc/nagvis/automaps/*
+	chmod 775		$fs/var/lib/nagvis
 
 	# Cleanup
-	rm -f $fs/usr/share/nagvis/install.*
-	rm -f $fs/usr/share/nagvis/share/uifx
+	rm -f			$fs/usr/share/nagvis/install.*
+	rm -f			$fs/usr/share/nagvis/share/uifx
 	
-	mv $fs/usr/share/nagvis/share/userfiles/images/maps $fs/var/lib/nagvis
-	chmod 775 $fs/var/lib/nagvis/maps
-	chmod 664 $fs/var/lib/nagvis/maps/*
-	ln -s /var/lib/nagvis/maps $fs/usr/share/nagvis/share/userfiles/images/
+	mv $fs/usr/share/nagvis/share/userfiles/images/maps \
+				$fs/var/lib/nagvis
+	chmod 775		$fs/var/lib/nagvis/maps
+	chmod 664		$fs/var/lib/nagvis/maps/*
+	ln -s /var/lib/nagvis/maps \
+				$fs/usr/share/nagvis/share/userfiles/images/
 }
 
 post_install()
@@ -99,7 +107,8 @@
 	cat <<EOT
 Now visit http://localhost/nagvis
 EOT
-	if [ -z "$1" ]; then
+	if [ -z "$1" ]
+	  then
 		/etc/init.d/nagios stop
 		/etc/init.d/nagios start
 	fi