X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=572eb9a006ebf6a839c2c696b9a982949000cf92;hb=61698b049bc7c3d64c7eaf91aca46df22583e61a;hp=7cdaa7586930774a1b98b468ff772f49d66c5ec2;hpb=4d13bda5f2560b3a738887977e506e2e72501ae9;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 7cdaa75..572eb9a 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,9 +1,11 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+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
@@ -32,26 +34,30 @@ pkg mrtg-cn			post_upgrade pkgadd munin-cn
 pkg mrtg-cn			pkgrm mrtg-cn
 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
+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
 # i konacno, provjeri da li stvari rade
 true				check_services postupgrade