X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=98fe327978dd38554865cd04db233ab2399764cc;hb=5036c2b87817f76ab042593f7160cf36685417f7;hp=2fbcacd58ccdf81d5a3c181edb3ef930961e04f2;hpb=50f8f7af6ef50eb419bf55e062a4b2b1a9943171;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 2fbcacd..98fe327 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -1,5 +1,11 @@ # Ivan 'ico' Rako # Zoran 'jelly' Dzelajlija +# Zeljko Boros + +PHPVER="7.3" +MDB="10.3" +PINFILE="/etc/apt/preferences.d/99-carnet" + notice () { LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75 @@ -367,7 +373,7 @@ check_upgrade () { if [ "$upgrade" ]; then notice " -Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa: +Prije prelaska na Debian stretch potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: @@ -530,16 +536,18 @@ create_sources_list () { # backup old version if [ -f $sl -a ! -f $sl.$backup_ext ]; then - cp -av $sl $sl.$backup_ext + cp -v $sl $sl.$backup_ext fi # install new version - cp -av $sl_new $sl + cp -v $sl_new $sl notice "Novi sadrzaj datoteke /etc/apt/sources.list: `cat /etc/apt/sources.list`" fi + # make sure permissions are correct + chmod 0644 $sl rm $sl_new } @@ -744,6 +752,11 @@ restore_configs () { fi } +# load various debconf defaults +debconf_preload () { + echo libc6 libraries/restart-without-asking boolean true | debconf-set-selections +} + # temporary disable listchanges packages to reduce clutter during upgrade apt_listchanges () { local file command=$1 @@ -861,17 +874,12 @@ pkgupgrade () { fi } -# make a silent upgrade to new libc6 -upgrade_libc () { - DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata -} - -# upgrade apache2/php5 +# upgrade apache2/php upgrade_apache2 () { - pkgrm apache-common # prevents installation of apache2-suexec - pkgrm php5-suhosin # not available for wheezy - pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \ - php5-odbc +### ne treba od etcha +### pkgrm apache-common # prevents installation of apache2-suexec + pkgupgrade libapache2-mod-php$PHPVER php$PHPVER-cli php$PHPVER-cn apache2-cn \ + php$PHPVER-odbc mod-security-cn } upgrade_amavis () { @@ -884,19 +892,37 @@ upgrade_amavis () { fi done + # workaround for insserv complaining + if [ -x /sbin/insserv ]; then + if [ -r /etc/init.d/amavis.amavisd-new ]; then + /sbin/insserv amavis.amavisd-new + fi + fi + # install new packages pkgadd amavisd-cn amavisd-new + # workaround for insserv complaining + if [ -x /sbin/insserv ]; then + if [ -r /etc/init.d/amavis.amavisd-new ]; then + /sbin/insserv amavis.amavisd-new + fi + fi + # start new packages - /etc/init.d/amavisd-cn restart + ### By zelja, nema vise amavisd-cn, vjerujemo systemd-u + ### /etc/init.d/amavisd-cn restart + /etc/init.d/amavis restart } -# handle mysql 5.0 to 5.1 upgrade +# handle mysql upgrade upgrade_mysql () { - if pkg mysql-server || pkg mysql-server-5.1; then - pkgadd mysql-server - dpkg -P mysql-server-5.1 - /etc/init.d/mysql restart + if pkg mysql-server || pkg mysql-server-5.5 || \ + pkg mariadb-server || pkg mariadb-server-$MDB + then + pkgadd default-mysql-server + dpkg -P mysql-server mysql-server-5.5 mariadb-server-$MDB + service mysql restart fi } @@ -916,9 +942,70 @@ upgrade_postfix () { fi } + +# pinning za baculu da se ne nadogradi sa 7.4.4 na 9.* u busteru +# istu stvar radi i bacula-cn.postinst + +fix_bacula() { + + echo "CN: Dodajem pinning bacule na inačicu 7.4.4..." + + test -f $PINFILE || touch $PINFILE + + cp-update bacula-cn $PINFILE < /etc/dovecot/conf.d/95-local + doveconf -n -c /etc/dovecot/dovecot.conf.$backup_ext > $local_conf + sed -i 's/\/user\/lib\/dovecot\/modules\/imap/\/usr\/lib\/dovecot\/modules/g' $local_conf pkgadd dovecot-cn fi @@ -981,6 +1069,19 @@ upgrade_mailman() { fi } +# manual upgrade of kernel due to new packet name +upgrade_kernel() { + if pkg kernel-2.6-cn; then + pkgrm kernel-2.6-cn + + if pkg grub-pc; then + pkgadd kernel-cn grub-pc + else + pkgadd kernel-cn + fi + fi +} + get_variable () { local name=$1 file=$2 val @@ -992,6 +1093,17 @@ get_variable () { echo $val } +# switch to rsyslog +upgrade_syslog() { + # libc6-dev prevents upgrade + if pkg libc6-dev; then + pkgrm libc6-dev + fi + + pkgadd rsyslog + dpkg -P sysklogd klogd > /dev/null 2>&1 +} + # restore munin configs for silent upgrade upgrade_munin () { local config backup hostname domain @@ -1043,12 +1155,12 @@ check_archives_space() { fi } -# calculate the list of linux-image packages from kernel-2.6-cn dependencies +# calculate the list of linux-image packages from kernel-cn dependencies get_cn_kernels() { local cn_kernels linux_images metapkg pkg cn_kernels= - linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \ + linux_images=$(apt-cache show kernel-cn | grep ^Depends: \ | grep -o 'linux-image[^, ]*') for metapkg in $linux_images; do pkg=$(apt-cache show $metapkg | grep ^Depends: \ @@ -1080,10 +1192,10 @@ check_kernel_space() { log "Kernel package: $pkg" log "Kernel size: ${kernel_size}MB" - if LC_ALL=C apt-get -s install kernel-2.6-cn 2>/dev/null \ - | grep -q '^kernel-2.6-cn is already the newest version.$' + if LC_ALL=C apt-get -s install kernel-cn 2>/dev/null \ + | grep -q '^kernel-cn is already the newest version.$' then - log "Not checking free space in /: kernel-2.6-cn already installed" + log "Not checking free space in /: kernel-cn already installed" return fi