X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Factions%2Fmain.queue;h=ddf0ebbd8bfb6c284ee1e7630df2c5bac2cb6320;hb=refs%2Fheads%2Fstretch;hp=df38d7e69a0df2cf5507aabda16278daaf1359cb;hpb=e964d270202710e62bc22ada8cb664aba7082fac;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index df38d7e..ddf0ebb 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,5 +1,6 @@
 # Full upgrade
 true				first_warning
+true				second_warning
 true				check_my_version
 true				hold_carnet_upgrade
 true				install_keyrings	# update current keys
@@ -7,7 +8,8 @@ true				check_upgrade
 true				check_reboot
 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.
@@ -30,12 +32,15 @@ true				upgrade_syslog
 true				debconf_preload
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
+# 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 bacula-cn			fix_bacula
 pkg bind9-cn			upgrade_bind
 pkg fail2ban-cn			upgrade_fail2ban
 pkg mailman-cn			upgrade_mailman
@@ -49,11 +54,12 @@ 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				enable_monit
+### nema monita-cn u ovom trenutku
+###true				enable_monit
 true				clean_old_kernels
 pkg kernel-cn			dpkg-reconfigure kernel-cn
 true				clean_initd_packages
-true				dpkg-reconfigure sysv-rc
+pkg sysv-rc			dpkg-reconfigure sysv-rc
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true				run_post_upgrade