X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Fdata.sh;h=f00c6d6906f2a985bd03c88d2454aacacbb51d0f;hb=ab75f551cbebec6dbb9f4d0bc3d332affde718e7;hp=08f0d7a566f41dc251ab1b5409d74842667d12cf;hpb=c3bc8ee970201031dd93362baa6e1d625555cdbf;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/data.sh b/usr/share/carnet-upgrade/data.sh
index 08f0d7a..f00c6d6 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	
@@ -84,18 +86,26 @@ Nessus		nessus-cn nessus nessusd
 services_to_check='
 amavisd-cn		amavis		amavisd \(master\)			Amavis
 amavisd-new-milter	amavis		/usr/sbin/amavis-milter			Amavis-milter
+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
+dovecot-cn		root		/usr/sbin/dovecot			Dovecot
 freeradius-cn		freerad		/usr/sbin/freeradius			FreeRADIUS
 mysql-cn		mysql		/usr/sbin/mysqld			MySQL
-sendmail-cn		root		sendmail: MTA: accepting connections	Sendmail
+ntp-cn			ntp		/usr/sbin/ntpd				ntpd
+oidentd-cn		oident		/usr/sbin/oidentd			oidentd
 openldap-cn		root		/usr/sbin/slapd				OpenLDAP
-oidentd-cn		nobody		/usr/sbin/oidentd			oidentd
 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)
+samba-cn		root		/usr/sbin/smbd				Samba
+spamassassin-cn		root		/usr/sbin/dccifd			DCC client
 spamassassin-cn		root		/usr/sbin/spamd				SpamAssassin
+vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd
-ntp-cn			root		/usr/sbin/ntpd				ntpd
 '