X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Factions%2Fmain.queue;h=772ea36c75a9fbd91e79aa781832708833f8886c;hb=ab75f551cbebec6dbb9f4d0bc3d332affde718e7;hp=c9560b955775df22d8a56b012aff6340ab57bd6e;hpb=c0c7b74b2c994d84c50ec6fa6837a73560c04abf;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/actions/main.queue b/usr/share/carnet-upgrade/actions/main.queue
index c9560b9..772ea36 100644
--- a/usr/share/carnet-upgrade/actions/main.queue
+++ b/usr/share/carnet-upgrade/actions/main.queue
@@ -2,13 +2,13 @@
 # Ivan 'ico' Rako <irako@srce.hr>
 # Zoran Dzelajlija <jelly@srce.hr>
 true				first_warning
-true				check_upgrade
-true				remove_bloat
+#true				check_upgrade
+#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
+#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
@@ -24,12 +24,25 @@ true				create_sources_list
 true				update			# apt-get update & download
 true				check_disk_space
 ! debconf_priority check	debconf_priority set	# utisaj debconf
+pkg apt-listchanges-cn		pkgrm apt-listchanges-cn # ne postoji vise
+true				upgrade_libc
+true				install_keyrings
+# popravi konfiguracije koje stvaraju probleme
+true				restore_configs
+pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
 # konacno, instalacija novih paketa
+pkg amavisd-cn			upgrade_amavis
+pkg apache-cn			upgrade_apache
+pkg mrtg-cn			pkgadd munin-cn
+pkg postfix-cn			upgrade_postfix
+pkg dovecot-cn			upgrade_dovecot
+pkg openldap-aai		upgrade_openldap
+pkg ntp-cn			upgrade_ntp
 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 apt-listchanges-cn deborphan
+true				pkgadd apt-listchanges deborphan
 # i ostatak
 true				debconf_priority reset
 true				add_group_proc		# + restart oidentd ako treba