Updated main action queue for lenny.

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 6fdc6ac..7cdaa75 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,8 +1,6 @@
 # Full upgrade
 true                           first_warning
-true                           fix_sarge_sources
 true                           check_my_version
-true                           check_apache_version
 true                           check_upgrade
 true                           check_grsec_kernel
 pkg xlibs                      remove_x
@@ -20,23 +18,27 @@ true                                create_sources_list
 true                           apt_update
 true                           check_archives_space
 true                           check_kernel_space
-true                           apt_download            # skini pakete
+true                           apt_download            # skini pakete
 ! debconf_priority check       debconf_priority set    # utisaj debconf
 pkg monit                      disable_monit
 true                           upgrade_libc
 true                           install_keyrings
+pkg udev                       upgrade_udev
+# popravi konfiguracije koje stvaraju probleme
+true                           restore_configs
 pkg skey-cn                    remove_skey
 # mrtg je zamjenjen sa munin
 pkg mrtg-cn                    post_upgrade pkgadd munin-cn
 pkg mrtg-cn                    pkgrm mrtg-cn
-# popravi konfiguracije koje stvaraju probleme
-true                           restore_configs
+pkg munin-cn                   upgrade_munin
 # konacno, instalacija novih paketa
 pkg amavisd-new                        upgrade_amavis
 pkg apache2-cn                 upgrade_apache2
 pkg dovecot-cn                 upgrade_dovecot
 pkg postfix-cn                 upgrade_postfix
 pkg openldap-aai               upgrade_openldap
+# ntp i ntpdate se ne pokrenu ispravno bez lockanja
+pkg ntp && pkg ntpdate         pkgadd lockfile-progs
 true                           upgrade_postgresql
 true                           upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije