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

diff --git a/usr/share/carnet-upgrade/data.sh b/usr/share/carnet-upgrade/data.sh
index f00c6d6..c8d85a6 100644
--- a/usr/share/carnet-upgrade/data.sh
+++ b/usr/share/carnet-upgrade/data.sh
@@ -84,8 +84,7 @@ 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
@@ -102,10 +101,9 @@ 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
 '