X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=0335654865ba3d05022de3e6a959cd2ebdbd6055;hb=7bf6d65fccb92a509ce93595e5de2e2dc675cd6b;hp=1880a6e2dc63cbdd99cbedc1f3030465ce9810d3;hpb=db10849635d562f44ee18074363ffe19b8a9753b;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 1880a6e..0335654 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,40 +1,49 @@
-# 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				check_grsec_kernel
+pkg xlibs			remove_x
 true				remove_bloat
+true				apt_listchanges disable
 true				comment_force_overwrite	# ruzna opcija za dpkg
 # 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
-true				update			# apt-get update & download
-true				check_disk_space
+true				apt_update
+true				check_archives_space
+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
 pkg skey-cn			remove_skey
+# mrtg je zamjenjen sa munin
 pkg mrtg-cn			post_upgrade pkgadd munin-cn
-pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
+pkg mrtg-cn			pkgrm mrtg-cn
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
 # konacno, instalacija novih paketa
-pkg amavisd-cn			upgrade_amavis
-pkg apache-cn			upgrade_apache
-pkg postfix-cn			pkgadd postfix-cn
-pkg postgrey			pkgrm postgrey		# problematican
+pkg amavisd-new			upgrade_amavis
+pkg apache2-cn			upgrade_apache2
+pkg dovecot-cn			upgrade_dovecot
+pkg postfix-cn			upgrade_postfix
 pkg openldap-aai		upgrade_openldap
+true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak
 # 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