# Fix missing redirection in cron files for amavisd-new-cronjob
add_redirection /etc/cron.d/amavisd-new
-# Cleanup and finalization
-if dpkg --compare-versions "$2" lt 2:20030616p10-4; then
- update-rc.d -f amavisd remove > /dev/null
- restart_daemon=1
- chown_ahome=1
- # a complicated way to say chmod 750
- dpkg-statoverride --remove $AHOME > /dev/null || true
- dpkg-statoverride --update --add amavis amavis 750 $AHOME
-fi
-
if [ -n "$chown_ahome" ]; then
# might be slow
echo -n "CN: Fixing ownership in /var/*/amavis... "
cp_echo -mailonly "CN: Fixed ownerships in /var/*/amavis."
fi
-# kill naughty pyzor descendants -- XXX needed for 2.4 or not?
-if dpkg --compare-versions "$2" lt 2:20030616p10-7 && \
- pgrep -u amavis -f '/usr/bin/pyzor check' > /dev/null; then
- if [ -x "/etc/init.d/amavisd-cn" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavisd-cn stop
- else
- /etc/init.d/amavisd-cn stop
- fi
- fi
- pkill -9 -u amavis -f '/usr/bin/pyzor check' > /dev/null || true
- if [ -x "/etc/init.d/amavisd-cn" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavisd-cn start
- else
- /etc/init.d/amavisd-cn start
- fi
- fi
- restart_daemon=
- restart_mta=
-fi
-
-# register for automatic start
-update-rc.d -f amavis remove >/dev/null || true
-update-rc.d amavisd-cn defaults 19 21 >/dev/null
-
-# START AMAVISD
-# about a half of amavisd-cn script is here
-#if [ "$restart_daemon" -a -x /etc/init.d/amavis.amavisd-new ]; then
-# if [ -x "/etc/init.d/amavis.amavisd-new" ]; then
-# if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-# invoke-rc.d amavis.amavisd-new restart
-# else
-# /etc/init.d/amavis.amavisd-new restart
-# fi
-# fi
-#fi
-## always check that the daemons are running
-#if ! wait_for_fds amavis; then
-# if [ -x "/etc/init.d/amavis.amavisd-new" ]; then
-# if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-# invoke-rc.d amavis.amavisd-new start
-# else
-# /etc/init.d/amavis.amavisd-new start
-# fi
-# fi
-# wait_for_fds amavis
-#fi
-#if [ "$restart_mta" ]; then
-# if [ -x "/etc/init.d/$mta" ]; then
-# if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-# invoke-rc.d $mta restart
-# else
-# /etc/init.d/$mta restart
-# fi
-# fi
-#fi
-
restart_daemon="1"
-
-if [ "$restart_daemon" -a -x /etc/init.d/amavisd-cn ]; then
- if [ -x "/etc/init.d/amavisd-cn" ]; then
+if [ "$restart_daemon" -a -x /etc/init.d/amavis ]; then
+ if [ -x "/etc/init.d/amavis" ]; then
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavisd-cn restart
+ invoke-rc.d amavis restart
else
- /etc/init.d/amavisd-cn restart
+ /etc/init.d/amavis restart
fi
fi
fi
cp_echo "CN: Deleting virus-mail older than 7 days every day at 04:25 AM"
cp_echo " (can be changed in $CRONTAB)"
fi
-# This script is, hopefully, not needed any more. Hide it.
-## display this message just once... maybe use debconf instead
-#if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
-# cp_echo ""
-# cp_echo "CN: To stop, start or restart all of the clamav+amavis+mta components,"
-# cp_echo "CN: use the /etc/init.d/amavisd-cn script."
-#fi
+
if [ "$failed" ]; then
cp_echo ""
cp_echo "CN: Services $failed failed to restart!"