X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=d7f2e202274592cd33b39da0f7909c2cbf01a066;hb=8a2a6fa288b2d869896b989632059c11ce977e48;hp=95dc3431e5fa53a29dcee7b253e5c2d46d460aa2;hpb=0d61ec643fce980d271cacd1b6dd866e01ef393c;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 95dc343..d7f2e20 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -2,8 +2,8 @@
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Zeljko Boros <zelja@carnet.hr>
 
-PHPVER="7.3"
-MDB="10.3"
+PHPVER="7.4"
+MDB="10.5"
 PINFILE="/etc/apt/preferences.d/99-carnet"
 
 
@@ -19,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
@@ -344,7 +352,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."
 }
@@ -373,7 +381,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:
@@ -953,6 +961,7 @@ fix_bacula() {
    test -f $PINFILE || touch $PINFILE
 
    cp-update bacula-cn $PINFILE <<EOF
+   
 Package: bacula-fd
 Pin: version 7.4.4*
 Pin-Priority: 1001
@@ -964,21 +973,24 @@ Pin-Priority: 1001
 Package: bacula-console
 Pin: version 7.4.4*
 Pin-Priority: 1001
+
 EOF
 
 }
 
-# pinning za ocsinventory da se na nadogradi sa 2.0.4 na 2.4.2
+# 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.4..."
+   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
 
 }
@@ -988,10 +1000,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