SliTaz Repositories

     1.1 --- a/monitorix/receipt	Tue Apr 30 15:42:25 2019 +0100
     1.2 +++ b/monitorix/receipt	Sun Mar 29 15:03:00 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="monitorix"
     1.7 -VERSION="3.11.0"
     1.8 +VERSION="3.12.0"
     1.9  CATEGORY="misc"
    1.10  SHORT_DESC="A lightweight system monitoring tool."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -12,7 +12,7 @@
    1.13  WGET_URL="${WEB_SITE}$TARBALL"
    1.14  
    1.15  SUGGESTED="iptables logrotate"
    1.16 -DEPENDS="perl-cgi perl-config-general perl-dbi perl-http-server-simple \
    1.17 +DEPENDS="perl-dbi perl-cgi perl-config-general perl-http-server-simple \
    1.18  	perl-libwww perl-mailtools perl-mime-lite perl-xml-simple rrdtool-perl"
    1.19  BUILD_DEPENDS=""
    1.20  
    1.21 @@ -25,31 +25,40 @@
    1.22  	mkdir -p $fs/usr/share/monitorix/cgi
    1.23  
    1.24  	cp -a $src/monitorix.conf	$fs/etc
    1.25 -	sed -i 's|/var/lib/monitorix|/usr/lib/monitorix|' $fs/etc/monitorix.conf
    1.26 -	sed -i 's|group = nobody|group = nogroup|' $fs/etc/monitorix.conf
    1.27 -	cp -a $src/docs/monitorix.logrotate $fs/etc/logrotate.d/monitorix
    1.28 +	sed -i 's|/var/lib/monitorix|/usr/lib/monitorix|' \
    1.29 +		$fs/etc/monitorix.conf
    1.30 +	sed -i 's|group = nobody|group = nogroup|' \
    1.31 +		$fs/etc/monitorix.conf
    1.32 +	cp -a $src/docs/monitorix.logrotate \
    1.33 +					$fs/etc/logrotate.d/monitorix
    1.34  	cp -a $src/monitorix		$fs/usr/bin
    1.35  	cp -a $src/lib			$fs/usr/lib/monitorix
    1.36  	cp -a $src/monitorix.cgi $src/*.png \
    1.37 -		$src/reports $fs/usr/share/monitorix
    1.38 +					$src/reports $fs/usr/share/monitorix
    1.39  }
    1.40  
    1.41  post_install()
    1.42  {
    1.43  	# Configure lighttpd server
    1.44 -	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.45 -		if ! grep -q /usr/share/monitorix/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.46 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]
    1.47 +	  then
    1.48 +		if ! grep -q /usr/share/monitorix/ "$1/etc/lighttpd/lighttpd.conf"
    1.49 +		  then
    1.50  	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/monitorix/" => "/usr/share/monitorix/",\n    "/monitorix-cgi/" => "/usr/share/monitorix/cgi/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
    1.51 -			if [ -z "$1" ]; then
    1.52 +			if [ -z "$1" ]
    1.53 +			  then
    1.54  				# Start Web server.
    1.55  				/etc/init.d/lighttpd stop
    1.56  				/etc/init.d/lighttpd start
    1.57  			fi
    1.58  		fi
    1.59  	fi
    1.60 +
    1.61  	# Configure apache server
    1.62 -	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.63 -		if [ ! -f "$1/etc/apache/conf.d/monitorix" ]; then
    1.64 +	if [ -f "$1/etc/apache/httpd.conf" ]
    1.65 +	  then
    1.66 +		if [ ! -f "$1/etc/apache/conf.d/monitorix" ]
    1.67 +		  then
    1.68  			cat > "$1/etc/apache/conf.d/monitorix" <<EOT
    1.69  Alias /monitorix /usr/share/monitorix
    1.70  ScriptAlias /monitorix-cgi /usr/share/monitorix/cgi
    1.71 @@ -63,7 +72,8 @@
    1.72  </Directory>
    1.73  
    1.74  EOT
    1.75 -			if [ -z "$1" ]; then
    1.76 +			if [ -z "$1" ]
    1.77 +			  then
    1.78  				# Start Web server.
    1.79  				/etc/init.d/apache stop
    1.80  				/etc/init.d/apache start