Reverted postgresql upgrade function.

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

diff --git a/src/data.sh b/src/data.sh
index e90abf7..916c9bc 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,5 +1,5 @@
 # Minimum free space on /var after the download, in MB
-min_var_space=250
+min_var_space=50
 
 # Backup extension
 backup_ext=cn4-upgrade
@@ -37,20 +37,22 @@ 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
 packages_second='
-amavis-stats-cn
 amavisd-cn
+amavis-stats-cn
 aosi-aai
 aosi-www-aai
 bind9-cn bind9
 clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
+kernel-2.6-cn
 libkrb5-17-heimdal
 monit-cn
 munin-cn
@@ -58,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       
 '
@@ -78,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
@@ -86,23 +87,31 @@ stari CN paketi     autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn
 services_to_check='
 amavisd-cn             amavis          amavisd [(]master[)]                    Amavis
 aosi-aai               aosi            /usr/sbin/aosi                          AOSI
+apache2-cn             www-data        /usr/sbin/apache2                       Apache2
 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
+dcc-client             dcc             /usr/sbin/dccifd                        DCC client
 dovecot-cn             root            /usr/sbin/dovecot                       Dovecot
 freeradius-aai         freerad         /usr/sbin/freeradius                    FreeRADIUS
+mailman-cn             list            /usr/lib/mailman/bin/mailmanctl         Mailman
+monit-cn               root            /usr/sbin/monit                         Monit
+munin-cn               root            /usr/sbin/munin-node                    Munin
 mysql-cn               mysql           /usr/sbin/mysqld                        MySQL
-ntp-cn                 ntp             /usr/sbin/ntpd                          ntpd
+ntop-cn                        ntop            /usr/sbin/ntop                          Ntop
+ntp-cn                 ntp             /usr/sbin/ntpd                          NTP
 oidentd-cn             oident          /usr/sbin/oidentd                       oidentd
 openldap-aai           openldap        /usr/sbin/slapd                         OpenLDAP
 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
-proftpd-cn             nobody          proftpd: [(]accepting connections[)]    ProFTPD (mozda se pokrece iz (x)inetd-a)
+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
+squid-cn               root            /usr/sbin/squid                         Squid
 vsftpd-cn              root            /usr/sbin/vsftpd                        VSFTPD
 xinetd-cn              root            /usr/sbin/xinetd                        xinetd
 '