Reverted postgresql upgrade function.

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

diff --git a/src/data.sh b/src/data.sh
index 0fce492..916c9bc 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -37,8 +37,9 @@ xinetd-cn     2:2.3.13-1
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
-# because dist-upgrade would rather remove them.
+# because dist-upgrade would rather remove or keep them back them.
 packages_first='
+libkrb5-17-heimdal postgresql-client unixodbc iptables
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -59,15 +60,14 @@ mysql-cn
 ntp-cn
 oidentd
 openldap-aai
-openssh-cn openssh-server              
+openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
 php4-odbc
 php4-xslt
-php5-cn
 postfix-cn
 spamassassin-cn        spamassassin razor dcc-client
 squirrelmail-cn squirrelmail
-vsftpd-cn vsftpd
+vsftpd-cn
 webalizer-cn
 xinetd-cn xinetd       
 '
@@ -79,7 +79,7 @@ gobjc gpc gcj gij chill g77           gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij ch
 nessus         libnessus2 nessus-cn
 prelude piwi   piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn
 snort          snort snort-cn snort-central-cn
-stari CN paketi        autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn jre-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn postgresql-cn procmail-cn python-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
+stari CN paketi        autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn jre-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
 '
 
 # Check if these services are running after upgrade
@@ -107,7 +107,7 @@ openssh-cn          root            /usr/sbin/sshd                          OpenSSH
 ossec-hids-cn          ossecm          /var/ossec/bin/ossec                    OSSec
 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
+postgresql             postgres        /usr/lib/postgresql/7.4/bin/postmaster  PostgreSQL
 samba-cn               root            /usr/sbin/smbd                          Samba
 snort-cn               snort           /usr/sbin/snort                         Snort
 spamassassin-cn                dcc             /usr/sbin/dccifd                        DCC client