Handle AAI upgrade.

[carnet-upgrade.git] / src / actions / main.queue

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 11160b0..a78f8a2 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,15 +1,14 @@
 # Full upgrade
 true                           first_warning
 true                           check_my_version
-true                           check_php_version
+true                           hold_carnet_upgrade
+true                           install_keyrings        # update current keys
 true                           check_upgrade
-true                           check_grsec_kernel
 true                           check_reboot
-pkg xlibs                      remove_x
+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
@@ -24,34 +23,26 @@ 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 amavisd-new                        upgrade_amavis
 pkg apache2-cn                 upgrade_apache2
 pkg postfix-cn                 upgrade_postfix
-# ntp i ntpdate se ne pokrenu ispravno bez lockanja
-pkg ntp && pkg ntpdate         pkgadd lockfile-progs
+pkg bind9-cn                   upgrade_bind
 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
+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
 pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
@@ -59,5 +50,6 @@ 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