X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=a550b9f3fff07a51561f8ce937889ab288d08c5a;hb=bfceaaf8132527d177dbce7e902b1dad88cacd0f;hp=3b930660ecac6cdff5af07f4e82f309544745761;hpb=8399eac47011395722b0fec41a51c69524843081;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 3b93066..a550b9f 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,12 +1,12 @@
 # Full upgrade
 true				first_warning
-true				fix_sarge_sources
 true				check_my_version
-true				check_apache_version
 true				check_upgrade
 true				check_grsec_kernel
+true				check_reboot
 pkg xlibs			remove_x
 true				remove_bloat
+true				remove_cn_bloat
 true				apt_listchanges disable
 true				comment_force_overwrite	# ruzna opcija za dpkg
 # ovo bi trebao biti zadnji post_upgrade - spremi popis
@@ -19,23 +19,29 @@ 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 openldap-aai		prepare_openldap
+pkg freeradius-aai		upgrade_freeradius
+pkg openldap-aai		upgrade_openldap
 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