X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Fdata.sh;h=18aa007381f79ec9923d740cc69b9966b16b75a3;hb=ff5e20ed5e61d73f9dc1d406923b19ee0784ae1d;hp=f00c6d6906f2a985bd03c88d2454aacacbb51d0f;hpb=67711c9f0f4f5e1a1b32a25be4d160fbe99ca265;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/data.sh b/usr/share/carnet-upgrade/data.sh
index f00c6d6..18aa007 100644
--- a/usr/share/carnet-upgrade/data.sh
+++ b/usr/share/carnet-upgrade/data.sh
@@ -84,28 +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
 dovecot-cn		root		/usr/sbin/dovecot			Dovecot
-freeradius-cn		freerad		/usr/sbin/freeradius			FreeRADIUS
+freeradius-aai		freerad		/usr/sbin/freeradius			FreeRADIUS
 mysql-cn		mysql		/usr/sbin/mysqld			MySQL
 ntp-cn			ntp		/usr/sbin/ntpd				ntpd
 oidentd-cn		oident		/usr/sbin/oidentd			oidentd
-openldap-cn		root		/usr/sbin/slapd				OpenLDAP
+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)
+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
+spamassassin-cn		dcc		/usr/sbin/dccifd			DCC client
 vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd
 '