X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=127674e58f1fb86a2207b935bf4ae3193fff8fe4;hb=b90b9808f739700741622ec6d3642f9176b01f47;hp=42e7d1bb72bfab23487ef07ed3c28b5a795b20db;hpb=70be44f3d0125218858a2fba082307096c5baa11;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 42e7d1b..127674e 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -2,15 +2,13 @@
 true				first_warning
 true				check_my_version
 true				hold_carnet_upgrade
-true				check_php_version
+true				install_keyrings	# update current keys
 true				check_upgrade
-true				check_grsec_kernel
 true				check_reboot
-pkg x11-common			remove_x
+pkg xserver-xorg		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
@@ -19,48 +17,46 @@ pkg slapd			backup_slapd_db
 true				backup_etc_dir		# etc i drugo
 true				create_sources_list
 true				apt_update
+true				cleanup_available
 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 udev			upgrade_udev
+true				install_keyrings	# install new keys
 # 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 openldap-aai		prepare_openldap
 pkg freeradius-aai		upgrade_freeradius
-pkg openldap-aai		upgrade_openldap
+pkg openldap-aai		pkgadd openldap-aai
 pkg amavisd-new			upgrade_amavis
+pkg mysql-server-5.1		upgrade_mysql
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
+pkg dovecot-cn			upgrade_dovecot
 pkg bind9-cn			upgrade_bind
-# ntp i ntpdate se ne pokrenu ispravno bez lockanja
-pkg ntp && pkg ntpdate		pkgadd lockfile-progs
+pkg fail2ban-cn			upgrade_fail2ban
 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
+pkg dhcp3-client		pkgadd isc-dhcp-client	# novi naziv za dhcp
+true				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradjeni
 # i ostatak
 true				add_group_proc		# za oidentd
-true				pkgadd monit-cn
-true 				remove_php4
+true				enable_monit
+true				clean_old_kernels
 pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
+true				clean_initd_packages
+true				dpkg-reconfigure sysv-rc
 # 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