X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=196c904337cddf8011327f384e1b0f34f52b62f8;hb=b6fae24fa516d341fce82b9fd04b7b82172677a6;hp=4d7359047853c8ec944c1b79ed424506660916c9;hpb=21cc3b75fcffb70d9f2d424468a5ba9914801b6b;p=php5-cn.git

diff --git a/debian/postinst b/debian/postinst
index 4d73590..196c904 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -112,17 +112,21 @@ done
 #
 for SAPI in apache apache2 cgi cli; do
 
+	if [ ! -d "$PHP5DIR/$SAPI" ]; then
+		continue
+	fi
+
 	ini_file="$PHP5DIR/$SAPI/php.ini"
 
 	cp_echo "CN: Checking and enabling some CARNet specific parameters in file $ini_file"
-
+	
         if [ -f "$ini_file" ]; then
 
 		cp_check_and_sed "^[[:space:]]*upload_max_filesize[[:space:]]*=[[:space:]]*2M$" \
 			's/^[[:space:]]*upload_max_filesize[[:space:]]*=.*/upload_max_filesize = 256M/' \
 			"$ini_file" && need_restart=1 || true
 
-		cp_check_and_sed "^[[:space:]]*post_max_size[[:space]]*=[[:space:]]*8M$" \
+		cp_check_and_sed "^[[:space:]]*post_max_size[[:space:]]*=[[:space:]]*8M$" \
 			's/^[[:space:]]*post_max_size[[:space:]]*=.*/post_max_size = 256M/' \
 			"$ini_file" && need_restart=1 || true
 
@@ -163,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