wok-next diff daloradius/receipt @ rev 19786

Fix intltool (for scim).
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jun 19 17:21:41 2017 +0300 (2017-06-19)
parents 0db9ed7c2097
children d5aab818505e
line diff
     1.1 --- a/daloradius/receipt	Fri Aug 07 18:53:05 2015 +0200
     1.2 +++ b/daloradius/receipt	Mon Jun 19 17:21:41 2017 +0300
     1.3 @@ -32,9 +32,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/daloradius/ $1/etc/lighttpd/lighttpd.conf; then
     1.9 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/daloradius/" => "/usr/share/daloradius/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.10 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.11 +		if ! grep -q /usr/share/daloradius/ "$1/etc/lighttpd/lighttpd.conf"; then
    1.12 +	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/daloradius/" => "/usr/share/daloradius/",|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 @@ -43,9 +43,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/daloradius ]; then
    1.22 -			cat > $1/etc/apache/conf.d/daloradius <<EOT
    1.23 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.24 +		if [ ! -f "$1/etc/apache/conf.d/daloradius" ]; then
    1.25 +			cat > "$1/etc/apache/conf.d/daloradius" <<EOT
    1.26  <IfModule mod_alias.c>
    1.27      Alias /daloradius /usr/share/daloradius
    1.28  </IfModule>