X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=dd8db6fc8c49bd2a2b7af909870f3c53d2b5141b;hb=8f3ffce4b9a0228d46309643aa64f1053522b592;hp=63557fed86e9c16f7bf1b10dcd23ce4f3307303b;hpb=c45a2c532414ceebe73d11d03a8857167c0cbd69;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 63557fe..dd8db6f 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -496,7 +496,9 @@ upgrade_amavis () {
 
   check_and_sed '^clamd.*5.clamav.log$' \
                 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
-                /etc/inet.d/amavisd-cn || true
+                /etc/init.d/amavisd-cn || true
+
+  /etc/init.d/amavis restart
 }
 
 # fix openldap-aai postinst user handling
@@ -508,18 +510,6 @@ upgrade_openldap () {
   dpkg --configure -a # try postinst again
 }
 
-# workaround postfix-cn dependencies
-upgrade_postfix () {
-  pkgadd sasl2-bin
-  pkgadd postfix postfix-cn
-}
-
-# workaround dovecot-cn dependencies
-upgrade_dovecot () {
-  pkgadd dovecot-imapd dovecot-pop3d
-  pkgadd dovecot-cn
-}
-
 # workaround ntp-cn dependencies
 upgrade_ntp () {
   pkgadd ntp ntpdate