X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=21b2e5878e4fb71a7295aeabbcfef7e83381b6aa;hb=3aa0c2486c49100544ae0904c5e6119a58e3f89e;hp=c087301e6191d01c257fb078e49ac70ced6ab6e3;hpb=43700e08ed15bf7d62f59cc285cd1d478e9b2882;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index c087301..21b2e58 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -5,7 +5,7 @@ true				hold_carnet_upgrade
 true				install_keyrings	# update current keys
 true				check_upgrade
 true				check_reboot
-pkg x11-common			remove_x
+pkg xserver-xorg		remove_x
 true				remove_bloat
 true				remove_cn_bloat
 true				apt_listchanges disable
@@ -17,6 +17,7 @@ pkg slapd			backup_slapd_db
 true				backup_etc_dir		# etc i drugo
 true				create_sources_list
 true				apt_update
+true				cleanup_available
 true				check_archives_space
 true				check_kernel_space
 true				apt_download		# skini pakete
@@ -28,13 +29,14 @@ true				install_keyrings	# install new keys
 true				restore_configs
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg freeradius-aai		upgrade_freeradius
-pkg openldap-aai		pkgadd openldap-aai
 pkg amavisd-new			upgrade_amavis
+pkg mysql-server-5.1		upgrade_mysql
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
+pkg dovecot-cn			upgrade_dovecot
 pkg bind9-cn			upgrade_bind
-pkg mysql-cn			upgrade_mysql
+pkg fail2ban-cn			upgrade_fail2ban
+pkg mailman-cn			upgrade_mailman
 true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
@@ -45,14 +47,15 @@ true				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradje
 # i ostatak
 true				add_group_proc		# za oidentd
 true				enable_monit
-pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
+true				clean_old_kernels
+pkg kernel-cn			dpkg-reconfigure kernel-cn
+true				clean_initd_packages
 true				dpkg-reconfigure sysv-rc
 # 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
 true				release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true				check_services postupgrade