wok diff phproxy/receipt @ rev 19076

web-google-service: complete last line in description.txt (hi, Leonardo)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Apr 25 04:36:15 2016 +0300 (2016-04-25)
parents afac960ce4cf
children 78ea1971fa79
line diff
     1.1 --- a/phproxy/receipt	Sun Apr 13 02:20:46 2014 +0200
     1.2 +++ b/phproxy/receipt	Mon Apr 25 04:36:15 2016 +0300
     1.3 @@ -35,9 +35,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/phproxy/ $1/etc/lighttpd/lighttpd.conf; then
     1.9 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phproxy/" => "/usr/share/phproxy/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.10 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.11 +		if ! grep -q /usr/share/phproxy/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.12 +	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phproxy/" => "/usr/share/phproxy/",|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 @@ -46,9 +46,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/phproxy ]; then
    1.22 -			cat > $1/etc/apache/conf.d/phproxy <<EOT
    1.23 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.24 +		if [ ! -f "$1/etc/apache/conf.d/phproxy" ]; then
    1.25 +			cat > "$1/etc/apache/conf.d/phproxy" <<EOT
    1.26  <IfModule mod_alias.c>
    1.27      Alias /phproxy /usr/share/phproxy
    1.28  </IfModule>