X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=efe0d6480fc2d7d3ce522687d653e09658011894;hb=5e28c58c1b2a741b45027951aa16bdeb7ab18908;hp=b4bd0e3789193de9b496c779dfe07ff091e3594d;hpb=c114b9878b474e560c7b8bc0d4d91d68bf5e5fe1;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index b4bd0e3..efe0d64 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -23,19 +23,26 @@ true				check_kernel_space
 true				apt_download		# skini pakete
 ! debconf_priority check	debconf_priority set	# utisaj debconf
 pkg monit			disable_monit
-true				upgrade_libc
 true				install_keyrings	# install new keys
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+true				upgrade_syslog
+true				debconf_preload
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg freeradius-aai		upgrade_freeradius
-pkg openldap-aai		pkgadd openldap-aai
+# by zelja, pinning na stare inačice
+pkg ocsinventory-agent-cn	fix_ocsinventory
+pkg bacula-cn			fix_bacula
+#
 pkg amavisd-new			upgrade_amavis
+true				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
+pkg kernel-2.6-cn		upgrade_kernel
 true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
@@ -46,14 +53,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				dpkg-reconfigure sysv-rc
+true				clean_old_kernels
+pkg kernel-cn			dpkg-reconfigure kernel-cn
+true				clean_initd_packages
+pkg sysv-rc			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