X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=d2f9d95cb2339690763a827d3455f1e4e36c42b5;hb=01011c3d05d7338500acb42d7da17a3ba8ca63cd;hp=b2feebfb04bd522817bfcf14342177df9aa853a8;hpb=d255d60db8f07a341f7f1acf929434dcf064b243;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index b2feebf..d2f9d95 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,6 +1,7 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+true				check_php_version
 true				check_upgrade
 true				check_grsec_kernel
 true				check_reboot
@@ -33,6 +34,8 @@ 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
@@ -43,16 +46,18 @@ 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
 # 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