X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=42e7d1bb72bfab23487ef07ed3c28b5a795b20db;hb=refs%2Ftags%2Fdebian%2F5.0.3;hp=d2f9d95cb2339690763a827d3455f1e4e36c42b5;hpb=01011c3d05d7338500acb42d7da17a3ba8ca63cd;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index d2f9d95..42e7d1b 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,11 +1,12 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+true				hold_carnet_upgrade
 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
@@ -39,8 +40,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
@@ -48,6 +49,7 @@ 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				add_group_proc		# za oidentd
 true				pkgadd monit-cn
@@ -59,5 +61,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