X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Factions%2Fmain.queue;h=50bb5b1e309ee07b4d236064e2c48e92404a09a7;hb=9e8ab2c99a8eb59f0a500734371be21e10fe39c8;hp=c9560b955775df22d8a56b012aff6340ab57bd6e;hpb=443e7578837f8011f7121d6f6406a40e8db88928;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/actions/main.queue b/usr/share/carnet-upgrade/actions/main.queue
index c9560b9..50bb5b1 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,7 +24,40 @@ true				create_sources_list
 true				update			# apt-get update & download
 true				check_disk_space
 ! debconf_priority check	debconf_priority set	# utisaj debconf
+# popravi konfiguracije koje stvaraju probleme
+pkg amavisd-cn			restore_config /etc/amavis/amavisd.conf
+pkg mysql-cn			restore_config /etc/mysql/my.cnf
+pkg php4-cn			restore_config /etc/php4/apache/php.ini
+pkg php4-cn			restore_config /etc/php4/cgi/php.ini
+pkg php4-cn			restore_config /etc/php4/cli/php.ini
+pkg dovecot-cn			restore_config /etc/dovecot/dovecot.conf
+pkg bind9-cn			restore_config /etc/bind/named.conf.options
+pkg kernel-2.6-cn		restore_config /etc/security/limits.conf
+pkg mysql-cn			restore_config /etc/init.d/mysql
+pkg openldap-aai		restore_config /etc/init.d/slapd
+pkg openldap-aai		restore_config /etc/default/slapd
+pkg xinetd-cn			restore_config /etc/xinetd.conf
+pkg vsftpd-cn			restore_config /etc/vsftpd.conf
+pkg ntp-cn			restore_config /etc/ntp.conf
+pkg ntp-cn			restore_config /etc/default/ntpdate
+pkg squirrelmail-cn		restore_config /etc/squirrelmail/apache.conf
+pkg oidentd-cn			restore_config /etc/default/oidentd
+pkg postfix-cn			restore_config /etc/default/postgrey
+pkg postfix-cn			restore_config /etc/default/saslauthd
+#pkg x			restore_config /etc/sysctl.conf
+#pkg x			restore_config /etc/apt/sources.list
+#pkg x			restore_config /etc/default/aide
+#pkg x			restore_config /etc/logrotate.d/mysql-server
+#pkg x			restore_config /etc/aide/aide.conf
+#pkg x			restore_config /etc/cron.daily/aide
+#pkg x			restore_config /etc/issue.net
+#pkg x			restore_config /etc/issue
+#pkg x			restore_config /etc/pam.d/login
+pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
 # konacno, instalacija novih paketa
+pkg amavisd-cn			restore_amavis_init
+pkg apache-cn			upgrade_apache
+pkg mrtg-cn			pkgadd munin-cn
 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