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

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 434219e..a78f8a2 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,10 +1,14 @@
 # Full upgrade
 true				first_warning
-true				check_apache_version
+true				check_my_version
+true				hold_carnet_upgrade
+true				install_keyrings	# update current keys
 true				check_upgrade
+true				check_reboot
+pkg x11-common			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
 # instaliranih servisa za koje cemo na kraju provjeriti da li rade.
 ! check_services check		check_services preupgrade
@@ -12,36 +16,40 @@ 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
+true				install_keyrings	# install new keys
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg amavisd-cn			upgrade_amavis
-pkg apache-cn			upgrade_apache
-pkg dovecot-cn			upgrade_dovecot
-pkg postfix-cn			pkgadd postfix-cn
-pkg postgrey			pkgrm postgrey		# problematican
+pkg freeradius-aai		upgrade_freeradius
 pkg openldap-aai		upgrade_openldap
-true				upgrade_vsftpd
+pkg amavisd-new			upgrade_amavis
+pkg apache2-cn			upgrade_apache2
+pkg postfix-cn			upgrade_postfix
+pkg bind9-cn			upgrade_bind
+true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak
+true				install_new		# instaliraj nove
+true				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradjeni
 # 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
+true				apt_listchanges enable
+true				debconf_priority reset
 true				fix_issue
+true				release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true				check_services postupgrade