# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1228229316 0
# Node ID 1143af92f66a95821e6547192c72efdfa54562e7
# Parent  6b8241a302f7c58ceb795f8b41645d4915e17dea
php-*: restart web server during reconfigure

diff -r 6b8241a302f7 -r 1143af92f66a php-apache/receipt
--- a/php-apache/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-apache/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -47,8 +47,12 @@
     Allow from all
 </DirectoryMatch>
 EOT
-	# Start Web server.
-	if [ -z "$1" -a ! -f "/var/run/apache/httpd.pid" ]; then
+	# Restart Web server.
+	if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ]; then
+		/etc/init.d/apache stop
+		sleep 2
+	fi
+	if [ -z "$1" ]; then
 		/etc/init.d/apache start
 	fi
 }
diff -r 6b8241a302f7 -r 1143af92f66a php-cups/receipt
--- a/php-cups/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-cups/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=cups.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -z "$1" -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,10 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		[ -f "/var/run/$file" ] || continue
+		if [ -f /etc/init.d/$daemon  ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
diff -r 6b8241a302f7 -r 1143af92f66a php-gd/receipt
--- a/php-gd/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-gd/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=gd.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -z "$1" -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,9 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
diff -r 6b8241a302f7 -r 1143af92f66a php-imap/receipt
--- a/php-imap/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-imap/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=imap.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,9 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
diff -r 6b8241a302f7 -r 1143af92f66a php-ldap/receipt
--- a/php-ldap/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-ldap/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=ldap.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,9 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
diff -r 6b8241a302f7 -r 1143af92f66a php-mhash/receipt
--- a/php-mhash/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-mhash/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=mhash.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,9 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
diff -r 6b8241a302f7 -r 1143af92f66a php-mysql/receipt
--- a/php-mysql/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-mysql/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=mysql.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,9 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
diff -r 6b8241a302f7 -r 1143af92f66a php-pear/receipt
--- a/php-pear/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-pear/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -19,15 +19,34 @@
 }
 
 # Pre and post install commands for Tazpkg.
+pre_install()
+{
+	while read daemon file; do
+		if [ -z "$1" -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
+}
+
 post_install()
 {
 	grep ^include_path $1/etc/php.ini
 	sed -i 's|/php/includes"|/php/includes"\ninclude_path = ".:/usr/share/php"|' $1/etc/php.ini
 	# Restart Web server.
-	for daemon in apache lighttpd ; do
+	while read daemon file; do
+		[ -z "$1" ] || continue
+		if [ -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
 		if [ -f /etc/init.d/$daemon ]; then
-			/etc/init.d/$daemon stop
 			/etc/init.d/$daemon start
 		fi
-	done
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
diff -r 6b8241a302f7 -r 1143af92f66a php-pgsql/receipt
--- a/php-pgsql/receipt	Tue Dec 02 12:32:00 2008 +0000
+++ b/php-pgsql/receipt	Tue Dec 02 14:48:36 2008 +0000
@@ -36,8 +36,12 @@
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=pgsql.so|' -i $1/etc/php.ini
 	# Start Web server.
 	while read daemon file; do
-		if [ -z "$1" -a -f /etc/init.d/$daemon \
-			     -a ! -f "/var/run/$file" ]; then
+		[ -z "$1" ] || continue
+		if [ -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
+		fi
+		if [ -f /etc/init.d/$daemon ]; then
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT
@@ -53,7 +57,9 @@
 
 	# Start Web server.
 	while read daemon file; do
-		if [ -f /etc/init.d/$daemon -a ! -f "/var/run/$file" ]; then
+		if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+			sleep 2
 			/etc/init.d/$daemon start
 		fi
 	done <<EOT