X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=5b9d2902e0714ea6110e134f7e212d9a6d351ece;hb=f8e87b446eb5130047dae1b587bd2c657862097d;hp=3e3d9c4026e10c6b5bf60aeeafa0ab0b74f6d2fe;hpb=4f801db34098e1c5fc78882dbeaf2a5d335a0308;p=php5-cn.git

diff --git a/debian/postinst b/debian/postinst
index 3e3d9c4..5b9d290 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,9 +4,6 @@ set -e
 
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
 case "$1" in
 	configure)
 	# continue below
@@ -28,7 +25,7 @@ esac
 
 PKG="php5-cn"
 A2MODEDIR="/etc/apache2/mods-enabled"
-EXTENSIONS="mysql ldap gd"
+EXTENSIONS="mysql"
 PHP5DIR="/etc/php5"
 PHP5CONFD="/etc/php5/conf.d"
 
@@ -51,7 +48,7 @@ if [ -e /etc/apache2/apache2.conf ]; then
 fi
 
 
-# Check if PHP5 extensions (MySQL, LDAP, GD) are enabled.
+# Check if PHP5 extensions are enabled.
 #
 for php5ext in $EXTENSIONS; do
 
@@ -167,14 +164,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