X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=2b4d74370bbdd1c15092ff59d8a9b4e70395134e;hb=89b053f3753b16731c1d16bf54ad60a7ac7e7786;hp=9100f66ffd7be9e4fffc9be4d61226a3b523612b;hpb=e964d270202710e62bc22ada8cb664aba7082fac;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 9100f66..2b4d743 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -2,6 +2,11 @@
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Zeljko Boros <zelja@carnet.hr>
 
+PHPVER="7.4"
+MDB="10.5"
+PINFILE="/etc/apt/preferences.d/99-carnet"
+
+
 notice () {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
 }
@@ -14,6 +19,14 @@ first_warning () {
   fi
 }
 
+second_warning () {
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_second_warning" 18 75
+  if [ $? -ne 0 ]; then
+    log "Upgrade canceled."
+    exit 0
+  fi
+}
+
 pkg() {
   local version
   dpkg -l "$1" 2> /dev/null | egrep -q "^.i" || return 1
@@ -155,6 +168,17 @@ remove_x() {
 }
 
 remove_bloat() {
+### zelja 2023-07-06
+tempdelfile=$(mktemp /tmp/tempdelfile.XXXX)
+
+for a in $bloats; do echo apt-get -qq -y remove $a 2\> /dev/null ; done > $tempdelfile
+
+/bin/bash $tempdelfile
+rm $tempdelfile
+
+return 0
+
+
   local to_remove add_this i j n text to_show cmd tmpfile installed
   local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist
   text="$msg_remove_bloat"
@@ -213,6 +237,9 @@ remove_bloat() {
 }
 
 remove_cn_bloat() {
+### Sve obrisano u remove_bloat()
+return 0
+
   local installed pkg cn_pkgs dialog_list selection cn_del to_del del_pkgs
 
   # get installed packages
@@ -339,7 +366,7 @@ Doslo je do greske prilikom izvrsavanja akcije '$action'. Detalje problema moguc
 Da bi dovrsili zapocete operacije nad paketima pokrenite:
 
   # dpkg --configure -a
-  # apt-get -f install
+  # apt -f install
 
 Nakon toga ponovno pozovite carnet-upgrade skriptu."
 }
@@ -368,7 +395,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian stretch potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian bullseye potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:
@@ -869,11 +896,12 @@ pkgupgrade () {
   fi
 }
 
-# upgrade apache2/pthp5
+# upgrade apache2/php
 upgrade_apache2 () {
-  pkgrm apache-common # prevents installation of apache2-suexec
-  pkgupgrade libapache2-mod-php7.0 php7.0-cli php7.0-cn apache2-cn \
-    php7.0-odbc mod-security-cn
+### 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 () {
@@ -912,10 +940,10 @@ upgrade_amavis () {
 # handle mysql upgrade
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.5 || \
-     pkg mariadb-server || pkg mariadb-server-10.0
+     pkg mariadb-server || pkg mariadb-server-$MDB
   then
      pkgadd default-mysql-server
-     dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0
+     dpkg -P mysql-server mysql-server-5.5 mariadb-server-$MDB
      service mysql restart
   fi
 }
@@ -943,11 +971,11 @@ upgrade_postfix () {
 fix_bacula() {
 
    echo "CN: Dodajem pinning bacule na inačicu 7.4.4..."
-   PINFILE=/etc/apt/preferences.d/99-carnet
 
    test -f $PINFILE || touch $PINFILE
 
    cp-update bacula-cn $PINFILE <<EOF
+   
 Package: bacula-fd
 Pin: version 7.4.4*
 Pin-Priority: 1001
@@ -959,8 +987,25 @@ Pin-Priority: 1001
 Package: bacula-console
 Pin: version 7.4.4*
 Pin-Priority: 1001
+
 EOF
 
+}
+
+# pinning za ocsinventory da se ne nadogradi sa 2.0.5 na 2.4.2
+
+fix_ocsinventory() {
+
+   echo "CN: Dodajem pinning ocsinventory-agenta na inačicu 2.0.5..."
+   test -f $PINFILE || touch $PINFILE
+
+   cp-update ocsinventory-agent-cn $PINFILE <<EOF
+
+Package: ocsinventory-agent
+Pin: version 2:2.0.5*
+Pin-Priority: 1001
+
+EOF
 
 }
 
@@ -969,10 +1014,10 @@ upgrade_dovecot() {
  # Funkcija koju je dodao Valentin da popravi propuste u dovecot-cn
  # Mičem zaostale konfiguracije iz conf.d i izlazim prije njegovih akcija jer ubiju certifikate
 
- echo "CN: Prebacujem stare konfiguracije za dovecot 95-cn\*-backup.conf u /var/backups..."
- test -f /etc/dovecot/conf.d/95-cn6-upgrade.conf && mv /etc/dovecot/conf.d/95-cn6-upgrade.conf /var/backups || true
- test -f /etc/dovecot/conf.d/95-cn7-upgrade.conf && mv /etc/dovecot/conf.d/95-cn7-upgrade.conf /var/backups || true
- test -f /etc/dovecot/conf.d/95-cn8-upgrade.conf && mv /etc/dovecot/conf.d/95-cn8-upgrade.conf /var/backups || true
+ test -f /etc/dovecot/conf.d/95-cn6-upgrade.conf && mv /etc/dovecot/conf.d/95-cn6-upgrade.conf* /var/backups || true
+ test -f /etc/dovecot/conf.d/95-cn7-upgrade.conf && mv /etc/dovecot/conf.d/95-cn7-upgrade.conf* /var/backups || true
+ test -f /etc/dovecot/conf.d/95-cn8-upgrade.conf && mv /etc/dovecot/conf.d/95-cn8-upgrade.conf* /var/backups || true
+ test -f /etc/dovecot/conf.d/95-cn9-upgrade.conf && mv /etc/dovecot/conf.d/95-cn9-upgrade.conf* /var/backups || true
    
  return 0
 
@@ -1082,7 +1127,7 @@ upgrade_syslog() {
   fi
 
   pkgadd rsyslog
-  dpkg -P sysklogd klogd
+  dpkg -P sysklogd klogd > /dev/null 2>&1
 }
 
 # restore munin configs for silent upgrade