Prve preinake

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

diff --git a/src/functions.sh b/src/functions.sh
index 95dc343..f198f62 100644 (file)
--- 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"
 
 
@@ -344,7 +344,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 +373,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 +953,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 +965,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 +992,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