Upgrade paketa za Debian lenny.

[apache2-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 0588a0f..98104f5 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -27,7 +27,7 @@ esac
 . /usr/share/carnet-tools/functions.sh
 
 PKG="apache2-cn"
-VERSION="2.2-1"
+VERSION="2.2-5"
 CONFDIR="/etc/apache2"
 CONF="$CONFDIR/apache2.conf"
 A2MODEDIR="$CONFDIR/mods-enabled"
@@ -114,33 +114,6 @@ chk_conf_tag () {
        fi
 }
 
-# conf_log_fix ()
-#
-#   Check CustomLog, ErrorLog and TransferLog paths - /var/log/apache/ is replaced
-#   with /var/log/apache2/.
-#
-conf_log_fix () {
-
-       local conf_file out
-       conf_file="$1"
-
-       if [ -f "$conf_file" ]; then
-       
-           if egrep -iq '^[[:space:]]*(Error|Custom|Transfer)Log[[:space:]]*\/var\/log\/apache\/' "$conf_file"; then
-           
-               out=$(mktemp ${conf_file}.XXXXXX)
-               temp_files="${temp_files} ${out}"
-           
-               sed 's/\(^[[:space:]]*\(Error\|Custom\|Transfer\)Log[[:space:]]*\)\/var\/log\/apache\//\1\/var\/log\/apache2\//I' \
-                   $conf_file > $out
-               mv $out $conf_file
-           fi
-           
-           # Be sure..
-           chmod 644 $conf_file
-       fi
-}
-
 # generate_ssl()
 #
 #   Generate Apache2 web server SSL certificate.
@@ -316,27 +289,6 @@ install_vhost() {
 trap cleanup 0 1 2 15
 
 
-# Make sure that monit conf for Apache is disabled.
-#
-if [ -f "/etc/monit.d/apache1.conf" ]; then
-       mv /etc/monit.d/apache1.conf /etc/monit.d/apache1.conf.disabled
-       pkill -9 -f /usr/sbin/monit || true
-fi
-
-
-# Make sure Apache is NOT running.
-#
-if [ -x /etc/init.d/apache ]; then
-       if [ -x /usr/sbin/invoke-rc.d ]; then
-               invoke-rc.d apache stop || true
-       else
-               /etc/init.d/apache stop || true
-       fi
-
-       pkill -9 -f '/usr/sbin/apache$' || true
-fi
-
-
 # Backup all configuration located in /etc/apache2/conf.d/ and
 # /etc/apache2/sites-available/ directories.
 #
@@ -404,14 +356,6 @@ if [ -e "$CONF" ]; then
            fi
        fi
 
-       if [ ! -e "$A2MODEDIR/php4.load" ] || [ ! -e "$A2MODEDIR/php4.conf" ]; then
-            if [ -e "/usr/lib/apache2/modules/libphp4.so" ]; then
-               cp_echo "CN: Enabling PHP4 module for Apache2 web server."
-               a2enmod php4 >/dev/null || true
-               need_restart=1
-            fi
-       fi
-
        if [ ! -e "$A2MODEDIR/ssl.load" ] || [ ! -e "$A2MODEDIR/ssl.conf" ]; then
                cp_echo "CN: Enabling SSL module for Apache2 web server."
                a2enmod ssl >/dev/null || true
@@ -598,23 +542,6 @@ for certf in $sslcerts; do
 done
 
 
-# Check for CustomLog, ErrorLog and TransferLog in Apache2 configuration.
-#
-cp_echo "CN: Checking Apache2 CustomLog, ErrorLog and TransferLog directives."
-if [ -d "$CONFDIR/conf.d" ] && [ -n "$(ls $CONFDIR/conf.d)" ]; then
-       log_mask=$CONFDIR/conf.d/*
-fi
-if [ -d "$CONFDIR/sites-available" ] && [ -n "$(ls $CONFDIR/sites-available)" ]; then
-       log_mask=$log_mask" "$CONFDIR/sites-available/*
-fi
-for file in $CONF $log_mask; do
-       chk_conf_tag "$file"
-       if [ $RET -eq 0 ]; then
-               conf_log_fix "$file"
-       fi
-done
-
-
 # Check and remove obsolete "Include /etc/apache2/sites-enabled/[^.#]*" from
 # /etc/apache2/apache2.conf.
 #
@@ -634,15 +561,6 @@ if egrep -iq "^[[:space:]]*Include[[:space:]]+\/etc\/apache2\/sites-enabled\/\[\
 fi
 
 
-# Start Apache2 web server on boot?
-# This will enable Apache2 in /etc/default/apache2 file.
-#
-if egrep -q "^[[:space:]]*NO_START=1" /etc/default/apache2; then
-       cp_check_and_sed NO_START=1 s/NO_START=1/NO_START=0/ /etc/default/apache2 || true
-       need_restart=1
-fi
-
-
 db_stop || true
 
 
@@ -656,43 +574,6 @@ fi
 [ -e "$CONFDIR/conf.d/aosi.conf" ] && rm -f $CONFDIR/conf.d/aosi.conf
 
 
-# Stop Apache web server and disable Apache automatic start on boot.
-#
-if [ -x "/etc/init.d/apache" ]; then
-
-       # Stop Apache.
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d apache stop || true
-       else
-               /etc/init.d/apache stop || true
-       fi
-
-       # Disable automatic start on boot.
-       if [ -x "`which update-rc.d 2>/dev/null`" ]; then
-               update-rc.d -f apache remove > /dev/null 2>&1 || true
-               update-rc.d apache stop 90 6 . > /dev/null 2>&1 || true
-       fi
-fi
-
-# Also check for Apache-SSL web server.
-#
-if [ -x "/etc/init.d/apache-ssl" ]; then
-
-       # Stop Apache-SSL.
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d apache-ssl stop || true
-       else
-               /etc/init.d/apache-ssl stop || true
-       fi
-
-       # Disable automatic start on boot.
-       if [ -x "`which update-rc.d 2>/dev/null`" ]; then
-               update-rc.d -f apache-ssl remove > /dev/null 2>&1 || true
-               update-rc.d apache-ssl stop 90 6 . > /dev/null 2>&1 || true
-       fi
-fi
-
-
 # Restart Apache2 web server if needed.
 #
 if [ $need_restart -eq 1 ]; then
@@ -703,9 +584,9 @@ if [ $need_restart -eq 1 ]; 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 force-reload || true
+                       invoke-rc.d apache2 restart || true
                    else
-                       /etc/init.d/apache2 force-reload || true
+                       /etc/init.d/apache2 restart || true
                    fi
                fi
        else