X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=d481e189a80ff273869383f2cd51fc6b1644d74e;hb=81bbe2c7e8bd2249bb680ad3cd022cd237bd2a48;hp=d8c280e4850af70b18a2e429074da8933e9cbd74;hpb=4b55deacabb8e748e003fef00627408c5f5b25f1;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index d8c280e..d481e18 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,8 +1,15 @@
 # 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_php_version
 true				check_upgrade
+true				check_grsec_kernel
+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
@@ -12,41 +19,49 @@ 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
-# postgresql-common/etch zahtjeva da postgresql nije instaliran
-pkg postgresql			post_upgrade pkgadd postgresql
-pkg postgresql			pkgrm postgresql
+pkg monit			disable_monit
 true				upgrade_libc
-true				install_keyrings
+true				install_keyrings	# install new keys
+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 mrtg-cn
-# popravi konfiguracije koje stvaraju probleme
-true				restore_configs
-# monit stvara probleme postinst skriptama
-pkg monit-cn			pkgrm monit-cn
+pkg mrtg-cn			pkgrm mrtg-cn
+pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg amavisd-cn			upgrade_amavis
+#pkg openldap-aai		prepare_openldap
+#pkg freeradius-aai		upgrade_freeradius
+#pkg openldap-aai		upgrade_openldap
+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 openldap-aai		upgrade_openldap
+pkg postfix-cn			upgrade_postfix
+pkg bind9-cn			upgrade_bind
+# 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				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradjeni
 true				dist_upgrade		# instaliraj ostatak
+true				install_new		# instaliraj nove
 # i ostatak
-true				debconf_priority reset
 true				add_group_proc		# za oidentd
 true				pkgadd monit-cn
+true 				remove_php4
 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