Make upgrade_amavis depend on amavisd-new instead of amavisd-cn.

[carnet-upgrade.git] / src / actions / main.queue

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 4fb017d..a6674d0 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -15,7 +15,7 @@ true                          create_sources_list
 true                           update                  # apt-get update & download
 true                           check_disk_space
 ! debconf_priority check       debconf_priority set    # utisaj debconf
-# postgresql-common/etch zahtjeva da postgresql nije instaliran
+pkg monit                      disable_monit
 true                           upgrade_libc
 true                           install_keyrings
 pkg skey-cn                    remove_skey
@@ -24,10 +24,8 @@ pkg mrtg-cn                  post_upgrade pkgadd munin-cn
 pkg mrtg-cn                    pkgrm mrtg-cn
 # popravi konfiguracije koje stvaraju probleme
 true                           restore_configs
-# monit stvara probleme postinst skriptama
-pkg monit-cn                   pkgrm monit-cn
 # konacno, instalacija novih paketa
-pkg amavisd-cn                 upgrade_amavis
+pkg amavisd-new                        upgrade_amavis
 pkg apache2-cn                 upgrade_apache2
 pkg dovecot-cn                 upgrade_dovecot
 pkg postfix-cn                 upgrade_postfix