X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=4fb017d07241121d9c530bfed973a38e054ccd69;hb=76df4be0475a22d848755eda27ce23845df70279;hp=de4e35a18607fb051e912fada668ade463a29df3;hpb=2e767d4b5b56762a785df22c2cc0de7d63aa3cff;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index de4e35a..4fb017d 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,5 +1,6 @@
 # Full upgrade
 true				first_warning
+true				check_apache_version
 true				check_upgrade
 true				remove_bloat
 true				apt_listchanges disable
@@ -14,19 +15,24 @@ 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
 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
+# 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 postfix-cn			pkgadd postfix-cn
-pkg postgrey			pkgrm postgrey		# problematican
+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