X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Factions%2Fmain.queue;h=d8c280e4850af70b18a2e429074da8933e9cbd74;hb=4b55deacabb8e748e003fef00627408c5f5b25f1;hp=434219e7fd9044d26e8f5c598ad22d235d48af0f;hpb=5aae55b00e9d4d3ee608df184b4253dab7a52783;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 434219e..d8c280e 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -15,21 +15,26 @@ 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
-true				upgrade_vsftpd
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak