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=28a7f16b769fd4966b62975a80509f31b84c6692;hb=593a505177247c3eedf76b9018b37c2b8be10789;hpb=1e70ff3fe998033fd93c8cd177082b8cd566d2ce

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 28a7f16..a78f8a2 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,61 +1,55 @@
-# last update: 2005-01-07
-# Ivan 'ico' Rako <irako@srce.hr>
-# Zoran Dzelajlija <jelly@srce.hr>
+# Full upgrade
 true				first_warning
+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				comment_force_overwrite	# ruzna opcija za dpkg
-pkg libpam-skey			pkgrm libpam-skey
-pkg skey-cn			pkgrm skey-cn
-#pkg getunix			pkgrm getunix		# obsolete
-#pkg getunix-cn			pkgrm getunix-cn
-true				fix_xinetd_conf		# ima i post-upgrade provjeru
-#pkg uw-imapd-ssl-cn		post_upgrade pkgrm uw-imapd-ssl
-pkg lynx-ssl-cn			post_upgrade pkgadd lynx-cn
-pkg apache			fix_mod_ssl_include
-[ -f /etc/webalizer.conf ]	fix_webalizer_conf
+true				remove_cn_bloat
+true				apt_listchanges disable
 # 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
-getent group proc		remove_group_proc	# calls post_upgrade add_group_proc
+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
+true				install_keyrings	# install new keys
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
-pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
+pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg amavisd-cn			upgrade_amavis
-pkg postfix-cn			upgrade_postfix
-pkg dovecot-cn			upgrade_dovecot
+pkg freeradius-aai		upgrade_freeradius
 pkg openldap-aai		upgrade_openldap
-pkg apache-cn			upgrade_apache
-pkg mrtg-cn			pkgadd munin-cn
-pkg ntp-cn			upgrade_ntp
+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
-pkg freeradius-cn lt 2:1.0.1-2	install_freeradius	# neki su totalno poremeceni # fix 2.1.4
-true				dist_upgrade
-true				pkgadd apt-listchanges deborphan
+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		# + restart oidentd ako treba
-pkg raidtools2			fix_etc_default_raid2
-pkg proftpd			fix_proftpd_conf	# + restart ako treba
-pkg aide-arms-client		fix_aidexfer_conf
-pkg sendmail-cn ge 2:8.13.1-2	fix_smtp_auth
-pkg kernel-cn			dpkg-reconfigure kernel-cn
-pkg sys-mon-cn			dpkg-reconfigure sys-mon-cn
-pkg amavisd-cn			dpkg-reconfigure amavisd-cn	# vise ne treba?
-#true				post_upgrade_do_deborphan
+true				add_group_proc		# za oidentd
+true				pkgadd monit-cn
+pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
 # 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