wok diff lighttpd-ssl/receipt @ rev 18897

syslinux/isohybrid.exe add -r support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 14 22:06:06 2016 +0100 (2016-02-14)
parents 9e01bc6321ea
children 3630f18392bd
line diff
     1.1 --- a/lighttpd-ssl/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/lighttpd-ssl/receipt	Sun Feb 14 22:06:06 2016 +0100
     1.3 @@ -39,9 +39,9 @@
     1.4  		--disable-ipv6 \
     1.5  		--with-openssl \
     1.6  		--prefix=/usr \
     1.7 -    	--libdir=/usr/lib/lighttpd \
     1.8 -    	--mandir=/usr/share/man \
     1.9 -    	$CONFIGURE_ARGS &&
    1.10 +		--libdir=/usr/lib/lighttpd \
    1.11 +		--mandir=/usr/share/man \
    1.12 +		$CONFIGURE_ARGS &&
    1.13  	make &&
    1.14  	make DESTDIR=$DESTDIR install
    1.15  }
    1.16 @@ -56,10 +56,10 @@
    1.17  
    1.18  	# Modules.
    1.19  	mkdir -p $fs/usr/lib/lighttpd
    1.20 -	for module in $BASE_MODULES
    1.21 -	do
    1.22 +	for module in $BASE_MODULES; do
    1.23 +		action 'Copying : mod_${module}.so'
    1.24  		cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd
    1.25 -		echo -n "Copying : mod_${module}.so" && status
    1.26 +		status
    1.27  	done
    1.28  
    1.29  	# Server root and config file.
    1.30 @@ -95,13 +95,11 @@
    1.31  # We stop the server by default in case of upgarde.
    1.32  pre_install()
    1.33  {
    1.34 -	echo "Processing pre-install commands..."
    1.35  	[ -f /etc/init.d/lighttpd ] && /etc/init.d/lighttpd stop
    1.36  }
    1.37  
    1.38  post_install()
    1.39  {
    1.40 -	echo "Processing post-install commands..."
    1.41  	if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then
    1.42  		openssl req -new -x509 \
    1.43  			-keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \