X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=d8c280e4850af70b18a2e429074da8933e9cbd74;hb=4b55deacabb8e748e003fef00627408c5f5b25f1;hp=16a6b5fe21a0fa97a0efd1d86679038e38db1308;hpb=4d79188e7e890bee52fc671a426c60642ba4422f;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 16a6b5f..d8c280e 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,10 +1,9 @@
-# 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				disable_apt_listchanges
+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.
@@ -16,16 +15,23 @@ true				create_sources_list
 true				update			# apt-get update & download
 true				check_disk_space
 ! debconf_priority check	debconf_priority set	# utisaj debconf
+# postgresql-common/etch zahtjeva da postgresql nije instaliran
+pkg postgresql			post_upgrade pkgadd postgresql
+pkg postgresql			pkgrm postgresql
 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 mrtg-cn
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+# monit stvara probleme postinst skriptama
+pkg monit-cn			pkgrm monit-cn
 # konacno, instalacija novih paketa
 pkg amavisd-cn			upgrade_amavis
-pkg apache-cn			upgrade_apache
+pkg apache2-cn			upgrade_apache2
+pkg dovecot-cn			upgrade_dovecot
 pkg postfix-cn			pkgadd postfix-cn
 pkg postgrey			pkgrm postgrey		# problematican
 pkg openldap-aai		upgrade_openldap
@@ -35,7 +41,9 @@ 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