X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Fdata.sh;h=842833edcb4610ee46d61dcd528bcac3fe757cee;hb=8b77eb4a8f1b8f77be87eb5693008ccc916ce242;hp=de9eb71afa66b478a7f5269da0e459bb7aec7019;hpb=9370d32b1c4acd3b7906690aede0c76db047758c;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/data.sh b/usr/share/carnet-upgrade/data.sh
index de9eb71..842833e 100644
--- a/usr/share/carnet-upgrade/data.sh
+++ b/usr/share/carnet-upgrade/data.sh
@@ -27,6 +27,7 @@ aosi-aai	1.6.3
 aosi-www-aai	1.5.7sarge0
 freeradius-aai	1.1.7-0
 openldap-aai	2.2.23-13
+mysql-common	4.0.24-10sarge3
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
@@ -34,7 +35,10 @@ openldap-aai	2.2.23-13
 packages_first='
 php4-odbc
 php4-xslt
-apache2-cn php5-cn squirrelmail-cn
+amavisd-cn
+php5-cn
+squirrelmail-cn
+mysql-cn
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -43,7 +47,6 @@ bind9-cn bind9
 openssh-cn openssh-server		
 clamav-cn clamav-daemon
 spamassassin-cn	spamassassin razor dcc-client
-amavisd-cn
 postfix-cn
 dovecot-cn dovecot
 squirrelmail-cn
@@ -51,7 +54,6 @@ openldap-aai
 freeradius-aai freeradius
 aosi-aai
 aosi-www-aai
-mysql-cn
 ntp-cn ntp
 vsftpd-cn vsftpd
 xinetd-cn xinetd	
@@ -73,7 +75,7 @@ Expect		expect-cn expect
 GCC		gcc-2.95-cn gcc-2.95 g++-2.95 gcc-2.95-doc gcc-cn gcc g++ gcc-doc gcc-misc-cn gobjc gpc gcj gij chill g77
 GDB		gdb-cn gdb
 Gettext		gettext-cn gettext
-Make		make-cn make
+Make		make-cn 
 Nessus		nessus-cn nessus nessusd
 '
 # php4-gd -> libgd1 -> xlibs -> xfree86-common -> suxx
@@ -82,21 +84,26 @@ Nessus		nessus-cn nessus nessusd
 # 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-new-milter	amavis		/usr/sbin/amavis-milter			Amavis-milter
+amavisd-cn		amavis		amavisd [(]master[)]			Amavis
+aosi-aai		aosi		/usr/sbin/aosi				AOSI
 apache-cn		www-data	/usr/sbin/apache			Apache
 bind9-cn		bind		/usr/sbin/named				Bind
+clamav-cn		clamav		/usr/bin/freshclam			ClamAV update
 clamav-cn		clamav		/usr/sbin/clamd				ClamAV
-freeradius-cn		freerad		/usr/sbin/freeradius			FreeRADIUS
+dovecot-cn		root		/usr/sbin/dovecot			Dovecot
+freeradius-aai		freerad		/usr/sbin/freeradius			FreeRADIUS
 mysql-cn		mysql		/usr/sbin/mysqld			MySQL
-postfix-cn		root		/usr/lib/postfix/master	Postfix
-openldap-cn		root		/usr/sbin/slapd				OpenLDAP
-oidentd-cn		nobody		/usr/sbin/oidentd			oidentd
+ntp-cn			ntp		/usr/sbin/ntpd				ntpd
+oidentd-cn		oident		/usr/sbin/oidentd			oidentd
+openldap-aai		openldap	/usr/sbin/slapd				OpenLDAP
 openssh-cn		root		/usr/sbin/sshd				OpenSSH
+postfix-cn		postgrey	/usr/sbin/postgrey			Postfix greylisting
+postfix-cn		root		/usr/lib/postfix/master			Postfix
+postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
 postgresql-cn		postgres	/usr/lib/postgresql/bin/postmaster	PostgreSQL
-proftpd-cn		nobody		proftpd: \(accepting connections\)	ProFTPD (mozda se pokrece iz (x)inetd-a)
-vsftpd-cn		root		/usr/sbin/vsftpd	VSFTPD
-spamassassin-cn		root		/usr/sbin/spamd				SpamAssassin
+proftpd-cn		nobody		proftpd: [(]accepting connections[)]	ProFTPD (mozda se pokrece iz (x)inetd-a)
+samba-cn		root		/usr/sbin/smbd				Samba
+spamassassin-cn		dcc		/usr/sbin/dccifd			DCC client
+vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd
-ntp-cn			root		/usr/sbin/ntpd				ntpd
 '