wok diff squidguardmgr/receipt @ rev 21759

mosh: use gcc83
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jun 26 19:12:58 2019 +0200 (2019-06-26)
parents 3d805214d753
children 46dcc80bef41
line diff
     1.1 --- a/squidguardmgr/receipt	Sat Nov 30 11:34:10 2013 +0000
     1.2 +++ b/squidguardmgr/receipt	Wed Jun 26 19:12:58 2019 +0200
     1.3 @@ -44,14 +44,14 @@
     1.4  post_install()
     1.5  {
     1.6  	# squidguardmgr config
     1.7 -	chown root.www $1/etc/squidGuard/squidGuard.conf
     1.8 -	chmod 664 $1/etc/squidGuard/squidGuard.conf
     1.9 -	chown nobody.nogroup $1/usr/share/squidguardmgr/lang/* \
    1.10 -		$1/usr/share/squidguardmgr/lang $1/usr/share/squidguardmgr
    1.11 +	chown root.www "$1/etc/squidGuard/squidGuard.conf"
    1.12 +	chmod 664 "$1/etc/squidGuard/squidGuard.conf"
    1.13 +	chown nobody.nogroup "$1"/usr/share/squidguardmgr/lang/* \
    1.14 +		"$1/usr/share/squidguardmgr/lang" "$1/usr/share/squidguardmgr"
    1.15  	# Configure lighttpd server
    1.16 -	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
    1.17 -		if ! grep -q /usr/share/squidguardmgr/ $1/etc/lighttpd/lighttpd.conf; then
    1.18 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squidguardmgr/" => "/usr/share/squidguardmgr/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.19 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.20 +		if ! grep -q /usr/share/squidguardmgr/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.21 +	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squidguardmgr/" => "/usr/share/squidguardmgr/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
    1.22  			if [ -z "$1" ]; then
    1.23  				# Start Web server.
    1.24  				/etc/init.d/lighttpd stop
    1.25 @@ -60,9 +60,9 @@
    1.26  		fi
    1.27  	fi
    1.28  	# Configure apache server
    1.29 -	if [ -f $1/etc/apache/httpd.conf ]; then
    1.30 -		if [ ! -f $1/etc/apache/conf.d/squidguardmgr ]; then
    1.31 -			cat > $1/etc/apache/conf.d/squidguardmgr <<EOT
    1.32 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.33 +		if [ ! -f "$1/etc/apache/conf.d/squidguardmgr" ]; then
    1.34 +			cat > "$1/etc/apache/conf.d/squidguardmgr" <<EOT
    1.35  <IfModule mod_alias.c>
    1.36      Alias /squidguardmgr /usr/share/squidguardmgr
    1.37  </IfModule>