X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=51b32ff352f7e5654e4e9a26a7a205a3dbe43ce7;hb=df6b014a9ea544d6b360580ee76163b77a88fe4b;hp=53edf3e186ff32322f7e87b7da151fa587040031;hpb=8f3ffce4b9a0228d46309643aa64f1053522b592;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 53edf3e..51b32ff 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -7,13 +7,6 @@ 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
-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
-pkg apache			fix_mod_ssl_include
-[ -f /etc/webalizer.conf ]	fix_webalizer_conf
 # 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
@@ -26,31 +19,22 @@ true				check_disk_space
 ! debconf_priority check	debconf_priority set	# utisaj debconf
 true				upgrade_libc
 true				install_keyrings
+pkg mrtg-cn			post_upgrade pkgadd munin-cn
+pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
 # 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 openldap-aai		upgrade_openldap
 pkg apache-cn			upgrade_apache
-pkg mrtg-cn			pkgadd munin-cn
-pkg ntp-cn			upgrade_ntp
+pkg openldap-aai		upgrade_openldap
 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 deborphan
+true				dist_upgrade		# instaliraj ostatak
+pkg postgrey			pkgrm postgrey		# problematican
 # i ostatak
 true				debconf_priority reset
-true				add_group_proc		# + restart oidentd ako treba
-pkg raidtools2			fix_etc_default_raid2
-pkg proftpd			fix_proftpd_conf	# + restart ako treba
-pkg aide-arms-client		fix_aidexfer_conf
-pkg sendmail-cn ge 2:8.13.1-2	fix_smtp_auth
+true				add_group_proc		# za oidentd
 pkg kernel-cn			dpkg-reconfigure kernel-cn
-pkg sys-mon-cn			dpkg-reconfigure sys-mon-cn
-pkg amavisd-cn			dpkg-reconfigure amavisd-cn	# vise ne treba?
-#true				post_upgrade_do_deborphan
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true				run_post_upgrade