Sve brisanje se događa u remove_bloat()

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

diff --git a/src/actions/main.queue b/src/actions/main.queue
index a9a408b..ddf0ebb 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,13 +1,15 @@
 # Full upgrade
 true                           first_warning
+true                           second_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
+pkg xserver-xorg               remove_x
 true                           remove_bloat
-true                           remove_cn_bloat
+###ne treba više, sve je strpano u remove_bloat
+###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.
@@ -17,40 +19,52 @@ 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        # install new keys
 # popravi konfiguracije koje stvaraju probleme
 true                           restore_configs
+true                           upgrade_syslog
+true                           debconf_preload
 pkg munin-cn                   upgrade_munin
 # konacno, instalacija novih paketa
-#pkg openldap-aai              prepare_openldap
-#pkg freeradius-aai            upgrade_freeradius
-#pkg openldap-aai              upgrade_openldap
+# by zelja, pinning na stare inačice
+pkg ocsinventory-agent-cn      fix_ocsinventory
+pkg bacula-cn                  fix_bacula
+#
 pkg amavisd-new                        upgrade_amavis
+true                           upgrade_mysql
 pkg apache2-cn                 upgrade_apache2
 pkg postfix-cn                 upgrade_postfix
+pkg dovecot-cn                 upgrade_dovecot
 pkg bind9-cn                   upgrade_bind
+pkg fail2ban-cn                        upgrade_fail2ban
+pkg mailman-cn                 upgrade_mailman
+pkg kernel-2.6-cn              upgrade_kernel
 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
+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
-pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
+### nema monita-cn u ovom trenutku
+###true                                enable_monit
+true                           clean_old_kernels
+pkg kernel-cn                  dpkg-reconfigure kernel-cn
+true                           clean_initd_packages
+pkg sysv-rc                    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