r2:

[php4-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 5a3279c..a806b2b 100755 (executable)
--- 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
@@ -112,17 +109,21 @@ done
 #
 for SAPI in apache apache2 cgi cli; do
 
-       ini_file="$PHP4DIR/$SAPI/php.ini"
+       if [ ! -d "$PHP5DIR/$SAPI" ]; then
+               continue
+       fi
 
-       cp_echo "CN: Checking and enabling some CARNet specific parameters in file $ini_file"
+       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 +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