wok diff monitorix/receipt @ rev 18760

get-foxit-reader: depends on 'libcups', not 'cups'
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Dec 29 20:38:21 2015 +0200 (2015-12-29)
parents 7518d9c7f507
children a78610b2eb47
line diff
     1.1 --- a/monitorix/receipt	Fri Jun 07 18:28:08 2013 +0200
     1.2 +++ b/monitorix/receipt	Tue Dec 29 20:38:21 2015 +0200
     1.3 @@ -38,9 +38,9 @@
     1.4  post_install()
     1.5  {
     1.6  	# Configure lighttpd server
     1.7 -	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
     1.8 -		if ! grep -q /usr/share/monitorix/ $1/etc/lighttpd/lighttpd.conf; then
     1.9 -	    		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.10 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.11 +		if ! grep -q /usr/share/monitorix/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.12 +	    		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.13  			if [ -z "$1" ]; then
    1.14  				# Start Web server.
    1.15  				/etc/init.d/lighttpd stop
    1.16 @@ -49,9 +49,9 @@
    1.17  		fi
    1.18  	fi
    1.19  	# Configure apache server
    1.20 -	if [ -f $1/etc/apache/httpd.conf ]; then
    1.21 -		if [ ! -f $1/etc/apache/conf.d/monitorix ]; then
    1.22 -			cat > $1/etc/apache/conf.d/monitorix <<EOT
    1.23 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.24 +		if [ ! -f "$1/etc/apache/conf.d/monitorix" ]; then
    1.25 +			cat > "$1/etc/apache/conf.d/monitorix" <<EOT
    1.26  Alias /monitorix /usr/share/monitorix
    1.27  ScriptAlias /monitorix-cgi /usr/share/monitorix/cgi
    1.28