X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=3543e079c9839270ea737ee8123a5da107427b5c;hb=a23afa2a6cd0f080bd80d3d02bcfe37684039b4d;hp=61cf51c65e3627d8cdfb0e72915556aec9a1e3df;hpb=10ec3e3b569db35e08ccc350359401a515574de1;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 61cf51c..3543e07 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,10 +1,13 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+true				hold_carnet_upgrade
+true				install_keyrings	# update current keys
+true				check_php_version
 true				check_upgrade
 true				check_grsec_kernel
 true				check_reboot
-pkg xlibs			remove_x
+pkg x11-common			remove_x
 true				remove_bloat
 true				remove_cn_bloat
 true				apt_listchanges disable
@@ -23,7 +26,7 @@ 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
@@ -38,8 +41,8 @@ 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 bind9-cn			upgrade_bind
 # ntp i ntpdate se ne pokrenu ispravno bez lockanja
 pkg ntp && pkg ntpdate		pkgadd lockfile-progs
 true				upgrade_postgresql
@@ -47,15 +50,18 @@ 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