X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=9c6c170e7e4d7c653b65c6934959edbf1ae807de;hb=07f81a2b4eb9cfd00817656c5756664ae1a3a0f8;hp=1b421cfe3a9097e109f27c4faec06faf03ec3b5f;hpb=3d1f4ebbbd06937d10750c92cda4b2a6a8a2b7bc;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 1b421cf..9c6c170 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -41,7 +41,7 @@ packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-wheezy/main/binary
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd ifupdown
+postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd ifupdown
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -55,9 +55,7 @@ clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
 isc-dhcp-client
-jre-cn
-kernel-2.6-cn
-libkrb5-17-heimdal
+kernel-cn
 monit-cn
 munin-cn
 mysql-cn mysql-client mysql-server
@@ -65,8 +63,6 @@ ntp-cn
 openldap-aai
 openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
-php4-odbc
-php4-xslt
 pine-cn
 postfix-cn
 spamassassin-cn	spamassassin razor
@@ -92,13 +88,14 @@ usbmgr		usbmgr
 # CN services to offer for removal
 cn_bloats='
 aide-cn aide-central-cn aide
+alpine-cn alpine alpine-pico
 amavisd-cn amavisd-new
 amavis-stats-cn amavis-stats
 bind9-cn bind9
 clamav-cn clamav-daemon clamav-freshclam clamav clamav-base
 dovecot-cn dovecot dovecot-imapd dovecot-pop3d dovecot-common
 kernel-source-cn
-jre-cn sun-java5-jre sun-java5-bin sun-java5-fonts
+jre-cn sun-java6-jre sun-java6-bin sun-java6-fonts
 mailman-cn mailman
 mrtg-cn mrtg
 munin-cn munin munin-node
@@ -133,7 +130,7 @@ mlocate
 # Check if these services are running after upgrade
 # package-cn		user		proces (pazi, regexp)			nice name
 services_to_check='
-amavisd-cn		amavis		amavisd [(]master[)]			Amavis
+amavisd-cn		amavis		/usr/sbin/amavisd-new [(]master[)]	Amavis
 aosi-aai		aosi		/usr/sbin/aosi				AOSI
 apache2-cn		www-data	/usr/sbin/apache2			Apache2
 bind9-cn		bind		/usr/sbin/named				Bind
@@ -142,8 +139,8 @@ clamav-cn		clamav		/usr/sbin/clamd				ClamAV
 dovecot-cn		root		/usr/sbin/dovecot			Dovecot
 freeradius-aai		freerad		/usr/sbin/freeradius			FreeRADIUS
 mailman-cn		list		/usr/lib/mailman/bin/mailmanctl		Mailman
-monit-cn		root		/usr/sbin/monit				Monit
-munin-cn		root		/usr/sbin/munin-node			Munin
+monit-cn		root		/usr/bin/monit				Monit
+munin-cn		root		munin-node				Munin
 mysql-cn		mysql		/usr/sbin/mysqld			MySQL
 ntp-cn			ntp		/usr/sbin/ntpd				NTP
 oidentd-cn		oident		/usr/sbin/oidentd			oidentd
@@ -152,7 +149,6 @@ openssh-cn		root		/usr/sbin/sshd				OpenSSH
 ossec-hids-cn		ossecm		/var/ossec/bin/ossec			OSSec
 postfix-cn		root		/usr/lib/postfix/master			Postfix
 postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
-postgresql		postgres	/usr/lib/postgresql/7.4/bin/postmaster	PostgreSQL
 samba-cn		root		/usr/sbin/smbd				Samba
 vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd