wok diff grooms/receipt @ rev 18958

apache: add /etc/apache/ssl/httpd-ssl.conf symlink (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 09 08:46:50 2016 +0100 (2016-03-09)
parents 7bb096863642
children aaae1f868d34
line diff
     1.1 --- a/grooms/receipt	Sat Sep 14 17:06:00 2013 +0000
     1.2 +++ b/grooms/receipt	Wed Mar 09 08:46:50 2016 +0100
     1.3 @@ -29,9 +29,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 /var/lib/grooms $1/etc/lighttpd/lighttpd.conf; then
     1.9 -			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/grooms/" => "/var/lib/grooms/",|g' -i $1/etc/lighttpd/lighttpd.conf
    1.10 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
    1.11 +		if ! grep -q /var/lib/grooms "$1/etc/lighttpd/lighttpd.conf"; then
    1.12 +			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/grooms/" => "/var/lib/grooms/",|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 @@ -40,9 +40,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/grooms ]; then
    1.22 -			cat > $1/etc/apache/conf.d/grooms <<EOT
    1.23 +	if [ -f "$1/etc/apache/httpd.conf" ]; then
    1.24 +		if [ ! -f "$1/etc/apache/conf.d/grooms" ]; then
    1.25 +			cat > "$1/etc/apache/conf.d/grooms" <<EOT
    1.26  <IfModule mod_alias.c>
    1.27  	Alias /grooms /var/lib/grooms
    1.28  </IfModule>