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 d8c280e..a6674d0 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -15,26 +15,22 @@ 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 postgresql                 post_upgrade pkgadd postgresql
-pkg postgresql                 pkgrm postgresql
+pkg monit                      disable_monit
 true                           upgrade_libc
 true                           install_keyrings
 pkg skey-cn                    remove_skey
 # mrtg je zamjenjen sa munin
 pkg mrtg-cn                    post_upgrade pkgadd munin-cn
-pkg mrtg-cn                    pkgrm mrtg mrtg-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                 pkgadd postfix-cn
-pkg postgrey                   pkgrm postgrey          # problematican
+pkg postfix-cn                 upgrade_postfix
 pkg openldap-aai               upgrade_openldap
+true                           upgrade_postgresql
 true                           upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije
 true                           dist_upgrade            # instaliraj ostatak