X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=3543e079c9839270ea737ee8123a5da107427b5c;hb=5a3aa5db31ff162d2cfa154997049df3b1ad294c;hp=6fdc6ac2b217efbaf351c349aebeab50f55352ee;hpb=52549f701db44118d4691cf59478299fbc1e830a;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 6fdc6ac..3543e07 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,11 +1,13 @@
 # Full upgrade
 true				first_warning
-true				fix_sarge_sources
 true				check_my_version
-true				check_apache_version
+true				hold_carnet_upgrade
+true				install_keyrings	# update current keys
+true				check_php_version
 true				check_upgrade
 true				check_grsec_kernel
-pkg xlibs			remove_x
+true				check_reboot
+pkg x11-common			remove_x
 true				remove_bloat
 true				remove_cn_bloat
 true				apt_listchanges disable
@@ -20,36 +22,46 @@ 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
+true				install_keyrings	# install new keys
+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
+pkg bind9-cn			upgrade_bind
+# 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
+true				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradjeni
 true				dist_upgrade		# instaliraj ostatak
+true				install_new		# instaliraj nove
 # i ostatak
-true				debconf_priority reset
 true				add_group_proc		# za oidentd
 true				pkgadd monit-cn
+true 				remove_php4
 pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
-true				apt_listchanges enable
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true				run_post_upgrade
+true				apt_listchanges enable
+true				debconf_priority reset
 true				fix_issue
+true				release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true				check_services postupgrade