From: Dragan Dosen <ddosen@ffzg.hr>
Date: Mon, 5 Nov 2007 19:33:57 +0000 (+0000)
Subject: r5:   * Prepravljen nacin restartanja Apache2 web servera.
X-Git-Tag: v5.3.3+3~25
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=php5-cn.git;a=commitdiff_plain;h=b6fae24fa516d341fce82b9fd04b7b82172677a6

r5:   * Prepravljen nacin restartanja Apache2 web servera.
---

diff --git a/debian/postinst b/debian/postinst
index 3e3d9c4..196c904 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -167,14 +167,14 @@ done
 if [ $need_restart -eq 1 ]; then
 	
 	# Check Apache2 web server configuration.
-	if apache2ctl configtest 2>/dev/null; then
+	if /usr/sbin/apache2ctl configtest 2>/dev/null; then
 
 		# Restart Apache2 web server.
 		if [ -x "/etc/init.d/apache2" ]; then
 	            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-	                invoke-rc.d apache2 restart || exit $?
+			invoke-rc.d apache2 force-reload || true
 		    else
-	                /etc/init.d/apache2 restart || exit $?
+			/etc/init.d/apache2 force-reload || true
 	    	    fi
 		fi
 	else