X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=434219e7fd9044d26e8f5c598ad22d235d48af0f;hb=5d44c693b1e82ce1b28b615a48931c4b6e59452b;hp=f5bb7db22a6a26db537e80792d811935f3792bb3;hpb=c58414c56fd0a45c390a1b7b48b464c33decad47;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index f5bb7db..434219e 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,16 +1,14 @@
-# last update: 2005-01-07
-# Ivan 'ico' Rako <irako@srce.hr>
-# Zoran Dzelajlija <jelly@srce.hr>
+# Full upgrade
 true				first_warning
+true				check_apache_version
 true				check_upgrade
 true				remove_bloat
+true				apt_listchanges disable
 true				comment_force_overwrite	# ruzna opcija za dpkg
-pkg libpam-skey			pkgrm libpam-skey
-pkg skey-cn			pkgrm skey-cn
 # ovo bi trebao biti zadnji post_upgrade - spremi popis
 # instaliranih servisa za koje cemo na kraju provjeriti da li rade.
 ! check_services check		check_services preupgrade
-getent group proc		remove_group_proc	# calls post_upgrade add_group_proc
+true				remove_group_proc	# calls post_upgrade add_group_proc
 pkg slapd			backup_slapd_db
 true				backup_etc_dir		# etc i drugo
 true				create_sources_list
@@ -19,6 +17,7 @@ true				check_disk_space
 ! debconf_priority check	debconf_priority set	# utisaj debconf
 true				upgrade_libc
 true				install_keyrings
+pkg skey-cn			remove_skey
 pkg mrtg-cn			post_upgrade pkgadd munin-cn
 pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
 # popravi konfiguracije koje stvaraju probleme
@@ -26,16 +25,20 @@ true				restore_configs
 # konacno, instalacija novih paketa
 pkg amavisd-cn			upgrade_amavis
 pkg apache-cn			upgrade_apache
+pkg dovecot-cn			upgrade_dovecot
 pkg postfix-cn			pkgadd postfix-cn
+pkg postgrey			pkgrm postgrey		# problematican
 pkg openldap-aai		upgrade_openldap
+true				upgrade_vsftpd
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak
-pkg postgrey			pkgrm postgrey		# problematican
 # i ostatak
 true				debconf_priority reset
 true				add_group_proc		# za oidentd
+true				pkgadd monit-cn
 pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
+true				apt_listchanges enable
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true				run_post_upgrade