X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=d7b116f6c8b19187c2d05287ed9ed4d276259fe5;hb=95b8bf4e97409880f3ad6f1ed7126ec8d831e8be;hp=5e6aa78ea2344e1a44276c0b00fc63372bde2bdf;hpb=42e59f2c1715cc357d7f6fd0dfcae7e295e07a02;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 5e6aa78..d7b116f 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,7 +1,10 @@
 # Full upgrade
 true				first_warning
+true				check_my_version
 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
@@ -12,24 +15,27 @@ 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 amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
 pkg dovecot-cn			upgrade_dovecot
-pkg postfix-cn			pkgadd postfix-cn
-pkg postgrey			pkgrm postgrey		# problematican
+pkg postfix-cn			upgrade_postfix
 pkg openldap-aai		upgrade_openldap
-true				upgrade_vsftpd
+true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak