X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=d481e189a80ff273869383f2cd51fc6b1644d74e;hb=f1c8e96a5fba77f21eb668ee23a4afc787f3f07b;hp=11160b02f6034ebae70092d821dcdac4abcb0e0d;hpb=8d24fff558034de33646c2ab3a4d9954fc55c107;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 11160b0..d481e18 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,11 +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
@@ -24,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
@@ -34,12 +36,13 @@ 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 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 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
@@ -59,5 +62,6 @@ 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