Remove postgrey right after new postfix is installed.

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

diff --git a/src/actions/main.queue b/src/actions/main.queue
index c183379..969ccd9 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -7,11 +7,6 @@ true                           remove_bloat
 true                           comment_force_overwrite # ruzna opcija za dpkg
 pkg libpam-skey                        pkgrm libpam-skey
 pkg skey-cn                    pkgrm skey-cn
-true                           fix_xinetd_conf         # ima i post-upgrade provjeru
-#pkg uw-imapd-ssl-cn           post_upgrade pkgrm uw-imapd-ssl
-pkg lynx-ssl-cn                        post_upgrade pkgadd lynx-cn
-pkg apache                     fix_mod_ssl_include
-[ -f /etc/webalizer.conf ]     fix_webalizer_conf
 # ovo bi trebao biti zadnji post_upgrade - spremi popis
 # instaliranih servisa za koje cemo na kraju provjeriti da li rade.
 ! check_services check         check_services preupgrade
@@ -26,28 +21,21 @@ true                                upgrade_libc
 true                           install_keyrings
 pkg mrtg-cn                    post_upgrade pkgadd munin-cn
 pkg mrtg-cn                    pkgrm mrtg mrtg-cn      # zamjenjeno sa munin
-pkg postgrey                   pkgrm postgrey          # problematican
 # popravi konfiguracije koje stvaraju probleme
 true                           restore_configs
 # konacno, instalacija novih paketa
 pkg amavisd-cn                 upgrade_amavis
 pkg apache-cn                  upgrade_apache
+pkg postfix-cn                 pkgadd postfix-cn
+pkg postgrey                   pkgrm postgrey          # problematican
 pkg openldap-aai               upgrade_openldap
 true                           upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije
-true                           dist_upgrade
-true                           pkgadd apt-listchanges deborphan
+true                           dist_upgrade            # instaliraj ostatak
 # i ostatak
 true                           debconf_priority reset
-true                           add_group_proc          # + restart oidentd ako treba
-pkg raidtools2                 fix_etc_default_raid2
-pkg proftpd                    fix_proftpd_conf        # + restart ako treba
-pkg aide-arms-client           fix_aidexfer_conf
-pkg sendmail-cn ge 2:8.13.1-2  fix_smtp_auth
-pkg kernel-cn                  dpkg-reconfigure kernel-cn
-pkg sys-mon-cn                 dpkg-reconfigure sys-mon-cn
-pkg amavisd-cn                 dpkg-reconfigure amavisd-cn     # vise ne treba?
-#true                          post_upgrade_do_deborphan
+true                           add_group_proc          # za oidentd
+pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true                           run_post_upgrade