X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=b638104a1c7e16041293069ac8f45405276ea259;hb=93658add65079b4a5a5b678150d3d53805bb3c32;hp=63557fed86e9c16f7bf1b10dcd23ce4f3307303b;hpb=1e70ff3fe998033fd93c8cd177082b8cd566d2ce;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 63557fe..b638104 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -304,7 +304,7 @@ upgrade () { # funkcija utrpa ispravan sources.list create_sources_list () { - [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn3-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn3-upgrade + [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn4-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn4-upgrade cp /usr/share/carnet-upgrade/files/etc/apt/sources.list /etc/apt notice "Novi sadrzaj datoteke /etc/apt/sources.list: @@ -323,18 +323,25 @@ remove_group_proc () { add_group_proc () { if ! getent group proc > /dev/null; then + # grsec uses gid 99 for /proc files groupadd -g 99 proc log "groupadd -g 99 proc" - if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ] && \ - egrep -q 'OIDENT_GROUP.*proc' /etc/default/oidentd; then - /etc/init.d/oidentd restart || true + + # update oidentd so it uses the proc group + if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ]; then + if check_and_sed '^OIDENT_GROUP=oident' \ + 's/^\(OIDENT_GROUP\)=.*/\1=proc/' \ + /etc/default/oidentd; + then + /etc/init.d/oidentd restart + fi fi fi } # backup_slapd_db backup_slapd_db () { - local ldap_backup=/var/backups/slapcat.cn3-upgrade + local ldap_backup=/var/backups/slapcat.cn4-upgrade if [ ! -f $ldap_backup ]; then [ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius stop || true @@ -357,7 +364,7 @@ backup_slapd_db () { # backup etc direktorija backup_etc_dir () { - local etc_backup=/var/backups/etc.cn3-upgrade.tar.gz + local etc_backup=/var/backups/etc.cn4-upgrade.tar.gz if [ ! -f $etc_backup ]; then if tar cfz $etc_backup /etc 2> /dev/null; then @@ -373,25 +380,33 @@ backup_etc_dir () { # fixaj /etc/default/raid2 fix_etc_default_raid2 () { if [ -f /etc/default/raid2 ]; then - sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.cn3-upgrade.$$ - chown --reference=/etc/default/raid2 /etc/default/raid2.cn3-upgrade.$$ - chmod --reference=/etc/default/raid2 /etc/default/raid2.cn3-upgrade.$$ + sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.cn4-upgrade.$$ + chown --reference=/etc/default/raid2 /etc/default/raid2.cn4-upgrade.$$ + chmod --reference=/etc/default/raid2 /etc/default/raid2.cn4-upgrade.$$ - if ! cmp -s /etc/default/raid2.cn3-upgrade.$$ /etc/default/raid2; then + if ! cmp -s /etc/default/raid2.cn4-upgrade.$$ /etc/default/raid2; then log "Fixed /etc/default/raid2 AUTOSTART option." - mv /etc/default/raid2.cn3-upgrade.$$ /etc/default/raid2 + mv /etc/default/raid2.cn4-upgrade.$$ /etc/default/raid2 else - rm /etc/default/raid2.cn3-upgrade.$$ + rm /etc/default/raid2.cn4-upgrade.$$ fi fi } -# restore distribution config file +# restore original config file (if the new package version is not +# installed already) restore_config () { local file file_backup + local pkg=$1 ver=$2 + shift 2 + + # check package version + pkg $pkg lt $ver || return 0 + + # restore package files + for file in $*; do + file_backup=$file.cn4-upgrade - for file in "$@"; do - file_backup=$file.cn3-upgrade if [ -e $file -a ! -e $file_backup ]; then # backup file mv $file $file_backup @@ -406,39 +421,47 @@ restore_config () { # restore modified config to their package defaults # so the upgrade doesn't complain so much restore_configs () { - restore_config /etc/bind/named.conf.options - restore_config /etc/default/ntpdate - restore_config /etc/default/oidentd - restore_config /etc/default/postgrey - restore_config /etc/default/saslauthd - restore_config /etc/default/slapd - restore_config /etc/dovecot/dovecot.conf - restore_config /etc/init.d/mysql - restore_config /etc/init.d/slapd - restore_config /etc/issue - restore_config /etc/issue.net - restore_config /etc/logrotate.d/mysql-server - restore_config /etc/mysql/my.cnf - restore_config /etc/ntp.conf - restore_config /etc/pam.d/login - restore_config /etc/php4/apache/php.ini - restore_config /etc/php4/cgi/php.ini - restore_config /etc/php4/cli/php.ini - restore_config /etc/postgrey/whitelist_clients - restore_config /etc/security/limits.conf - restore_config /etc/squirrelmail/apache.conf - restore_config /etc/sysctl.conf - restore_config /etc/vsftpd.conf - restore_config /etc/xinetd.conf + restore_config base-files 4 /etc/issue /etc/issue.net + restore_config bind9 1:9.3.4 /etc/bind/named.conf.options + restore_config dovecot-common 1.0 /etc/dovecot/dovecot.conf + restore_config libapache-mod-php4 6:4.4.4 /etc/php4/apache/php.ini + restore_config libpam-modules 0.79 /etc/security/limits.conf + restore_config login 1:4.0.18.1 /etc/pam.d/login + restore_config mysql-server 5.0.3 /etc/init.d/mysql \ + /etc/logrotate.d/mysql-server \ + /etc/mysql/my.cnf + restore_config ntp 1:4.2.2 /etc/ntp.conf + restore_config ntpdate 1:4.2.2 /etc/default/ntpdate + restore_config oidentd 2.0.8 /etc/default/oidentd + restore_config php4-cgi 6:4.4.4 /etc/php4/cgi/php.ini + restore_config php4-cli 6:4.4.4 /etc/php4/cli/php.ini + restore_config postgrey 1.27 /etc/default/postgrey \ + /etc/postgrey/whitelist_clients + restore_config procps 1:3.2.7 /etc/sysctl.conf + restore_config sasl2-bin 2.1.22 /etc/default/saslauthd + restore_config slapd 2.3.30 /etc/default/slapd /etc/init.d/slapd + restore_config squirrelmail 2:1.4.9a /etc/squirrelmail/apache.conf + restore_config vsftpd 2.0.5 /etc/vsftpd.conf + restore_config xinetd 1:2.3.14 /etc/xinetd.conf # orphaned config file - no owner - rm -f /etc/logcheck/ignore.d.server/imap + if pkg logcheck-database lt 1.2.54; then + rm -f /etc/logcheck/ignore.d.server/imap + fi # aide switched to ucf, move old configs aside - for file in /etc/aide/aide.conf /etc/cron.daily/aide /etc/default/aide; do - [ ! -e "$file.cn3-upgrade" ] && mv "$file" "$file.cn3-upgrade" - rm -f "$file" - done + if pkg aide lt 0.13.1; then + for file in /etc/aide/aide.conf \ + /etc/cron.daily/aide \ + /etc/default/aide; + do + if [ ! -e "$file.cn4-upgrade" ]; then + mv "$file" "$file.cn4-upgrade" + fi + + rm -f "$file" + done + fi } # make a silent installation of carnet and srce keyrings @@ -457,30 +480,29 @@ upgrade_libc () { # upgrade apache -> apache2 upgrade_apache () { + # bugfix for apache2-cn postinst mkdir -p /etc/apache2 touch /etc/apache2/httpd.conf - pkgadd php4-odbc php4-xslt - - # apache2 conflicts with these - pkgrm apache aosi-aai aosi-www-aai php4-cn squirrelmail-cn - - # apache2-cn postinst needs new mktemp - #pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn - - pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert - apt-get install -y -d apache2-cn php4-cn - apt-get autoclean - dpkg -i --ignore-depends=apache2-cn \ - /var/cache/apt/archives/apache2-cn_* \ - /var/cache/apt/archives/php4-cn_* + # temporary remove packages conflicting with apache2 + delpkg="" + for p in aosi-aai aosi-www-aai \ + php4-cn php4-odbc php4-xslt \ + squirrelmail-cn; do + pkg p && delpkg="$delpkg $p" + done + eval pkgrm $delpkg + pkgrm apache apache-common - pkgadd aosi-aai aosi-www-aai # squirrelmail-cn + # install new packages + eval pkgadd apache2-cn apache2-mpm-prefork \ + php4-cn libapache2-mod-php4 \ + $delpkg } upgrade_amavis () { - # remove diversion + # remove init script diversion if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then rm -f /etc/init.d/amavis dpkg-divert --quiet --remove /etc/init.d/amavis @@ -488,15 +510,20 @@ upgrade_amavis () { # move old config aside local conf=/etc/amavis/amavisd.conf - if [ -e $conf -a ! -e $conf.cn3-upgrade ]; then - mv $conf $conf.cn3-upgrade + if [ -e $conf -a ! -e $conf.cn4-upgrade ]; then + mv $conf $conf.cn4-upgrade fi + # install new packages pkgadd amavisd-cn amavisd-new + # fix new packages check_and_sed '^clamd.*5.clamav.log$' \ 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \ - /etc/inet.d/amavisd-cn || true + /etc/init.d/amavisd-cn || true + + # start new packages + /etc/init.d/amavis restart } # fix openldap-aai postinst user handling @@ -508,57 +535,6 @@ upgrade_openldap () { dpkg --configure -a # try postinst again } -# workaround postfix-cn dependencies -upgrade_postfix () { - pkgadd sasl2-bin - pkgadd postfix postfix-cn -} - -# workaround dovecot-cn dependencies -upgrade_dovecot () { - pkgadd dovecot-imapd dovecot-pop3d - pkgadd dovecot-cn -} - -# workaround ntp-cn dependencies -upgrade_ntp () { - pkgadd ntp ntpdate - # pkgrm ntp-server - pkgadd ntp-cn -} - -# instaliraj zadnji freeradius; uvjeti u queue fileovima -install_freeradius () { - pkgadd --force-yes freeradius-cn freeradius=1.0.5-0 freeradius-ldap=1.0.5-0 -} - -# tentatively remove obsolete option in xinetd.conf -fix_xinetd_conf () { - if [ -f /etc/xinetd.conf ]; then - check_and_sed 'log_on_failure.*RECORD' \ - 's/\(log_on_failure.*\)RECORD/\1/g' \ - /etc/xinetd.conf || true - fi -} - -# temporarily disable mod_ssl.conf in apache so that upgrade works -fix_mod_ssl_include() { - if [ -f /etc/apache/mod_ssl.conf ]; then - check_and_sed '^Include /etc/apache/mod_ssl\.conf' \ - 's,\(^Include[ ][ ]*/etc/apache/mod_ssl\.conf\),#\1,' \ - /etc/apache/httpd.conf || true - fi -} - -fix_proftpd_conf() { - if [ -f /etc/proftpd.conf ]; then - check_and_sed '^LsDefaultOptions' \ - 's,^LsDefaultOptions,ListOptions,' \ - /etc/proftpd.conf || true - fi - [ -x /etc/init.d/proftpd ] && /etc/init.d/proftpd restart || true -} - # fix /etc/dpkg/dpkg.cfg comment_force_overwrite () { if [ -f /etc/dpkg/dpkg.cfg ]; then @@ -570,21 +546,13 @@ comment_force_overwrite () { fi } -fix_aidexfer_conf() { - if [ -f /etc/aide/aidexfer.conf ]; then - check_and_sed '/usr/local/lib/aidexfer' \ - 's,/usr/local/lib/aidexfer,/usr/share/aidexfer,' \ - /etc/aide/aidexfer.conf || true - fi -} - fix_issue () { cat > /etc/issue < /etc/issue.net <