More fixes for apache upgrade function.

[carnet-upgrade.git] / src / data.sh

diff --git a/src/data.sh b/src/data.sh
index 842833e..f29350c 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -48,13 +48,13 @@ openssh-cn openssh-server
 clamav-cn clamav-daemon
 spamassassin-cn        spamassassin razor dcc-client
 postfix-cn
-dovecot-cn dovecot
+dovecot-cn
 squirrelmail-cn
 openldap-aai
 freeradius-aai freeradius
 aosi-aai
 aosi-www-aai
-ntp-cn ntp
+ntp-cn
 vsftpd-cn vsftpd
 xinetd-cn xinetd       
 monit-cn
@@ -62,6 +62,7 @@ munin-cn
 ossec-hids-cn
 amavis-stats-cn
 webalizer-cn
+oidentd
 '
 
 # We want to remove these packages, used in remove_bloat()
@@ -97,7 +98,6 @@ 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