X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=7cdaa7586930774a1b98b468ff772f49d66c5ec2;hb=17a03476144e52e609b5ce79c4ebd16b488a6a6c;hp=e2fe134333dd48be20c1cf1ab50c97e45279daf3;hpb=6a3a2c168191ec411b938cc271535e692003dc2c;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index e2fe134..7cdaa75 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,8 +1,11 @@
 # Full upgrade
 true				first_warning
-true				check_apache_version
+true				check_my_version
 true				check_upgrade
+true				check_grsec_kernel
+pkg xlibs			remove_x
 true				remove_bloat
+true				remove_cn_bloat
 true				apt_listchanges disable
 true				comment_force_overwrite	# ruzna opcija za dpkg
 # ovo bi trebao biti zadnji post_upgrade - spremi popis
@@ -12,23 +15,31 @@ 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
-pkg mrtg-cn			post_upgrade pkgadd munin-cn
-pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
+pkg udev			upgrade_udev
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+pkg skey-cn			remove_skey
+# mrtg je zamjenjen sa munin
+pkg mrtg-cn			post_upgrade pkgadd munin-cn
+pkg mrtg-cn			pkgrm mrtg-cn
+pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg amavisd-cn			upgrade_amavis
-pkg apache-cn			upgrade_apache
+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
+# ntp i ntpdate se ne pokrenu ispravno bez lockanja
+pkg ntp && pkg ntpdate		pkgadd lockfile-progs
+true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak