Removed postfix and dovecot upgrade functions.

Fixed amavis-cn init script.

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 28a7f16..53edf3e 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -31,8 +31,6 @@ true                          restore_configs
 pkg mrtg-cn                    pkgrm mrtg mrtg-cn      # zamjenjeno sa munin
 # konacno, instalacija novih paketa
 pkg amavisd-cn                 upgrade_amavis
-pkg postfix-cn                 upgrade_postfix
-pkg dovecot-cn                 upgrade_dovecot
 pkg openldap-aai               upgrade_openldap
 pkg apache-cn                  upgrade_apache
 pkg mrtg-cn                    pkgadd munin-cn

diff --git a/src/data.sh b/src/data.sh
index 842833e..08dbdba 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -48,7 +48,7 @@ openssh-cn openssh-server
 clamav-cn clamav-daemon
 spamassassin-cn        spamassassin razor dcc-client
 postfix-cn
-dovecot-cn dovecot
+dovecot-cn
 squirrelmail-cn
 openldap-aai
 freeradius-aai freeradius

diff --git a/src/functions.sh b/src/functions.sh
index 63557fe..dd8db6f 100644 (file)
--- 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