X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=d481e189a80ff273869383f2cd51fc6b1644d74e;hb=aedd23b3aa1a52574a2cb53ff47b89a8830eeba9;hp=98574fb3009e30a73b372ea1a1df599b550a32c7;hpb=62570336ff4a368ae1b9de58f08d94a0da99f14c;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 98574fb..d481e18 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -2,6 +2,7 @@
 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
@@ -25,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
@@ -35,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