X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=191aafd214d85303c30ac163978e202a3d6206a4;hb=1ec1b8e0219d4a175387217ac74db1602bbf1119;hp=b7fba03fbf6e7683868885733f5bd8d5c23cc054;hpb=dbec0460642ff3c3d368eb22bbb0990a01640c62;p=amavisd-cn.git diff --git a/debian/postinst b/debian/postinst index b7fba03..191aafd 100755 --- a/debian/postinst +++ b/debian/postinst @@ -151,35 +151,48 @@ 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 [ "$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 [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d amavis.amavisd-new restart + invoke-rc.d amavisd-cn restart else - /etc/init.d/amavis.amavisd-new restart + /etc/init.d/amavisd-cn 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 # this needs to be updated when $CRONTAB file changes if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then @@ -220,10 +233,14 @@ for conffile in /etc/logcheck/violations.ignore.d/amavisd-new \ /etc/logcheck/ignore.d.server/amavisd-new \ /etc/logcheck/ignore.d.workstation/amavisd-new \ /etc/cron.daily/amavisd-new; do - cp_echo "CN: Deleting old conffile ${conffile}..." - rm -f ${conffile} + if [ -f ${conffile} ]; then + cp_echo "CN: Deleting old conffile ${conffile}..." + rm -f ${conffile} + fi done cp_mail $PKG $VERSION exit 0 + +#DEBHELPER#