X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=427e1a4eea1573e93c8b9923cc675a00255a743a;hb=refs%2Fheads%2Fbuster;hp=6f848aff7a6337078df2358340c32fabe9b56726;hpb=44f1007ba069e5c5c4c05c577e7dcad720234eb9;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 6f848af..427e1a4 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -4,6 +4,8 @@
 
 PHPVER="7.3"
 MDB="10.3"
+PINFILE="/etc/apt/preferences.d/99-carnet"
+
 
 notice () {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
@@ -947,11 +949,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
@@ -963,26 +965,25 @@ Pin-Priority: 1001
 Package: bacula-console
 Pin: version 7.4.4*
 Pin-Priority: 1001
-EOF
 
+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_bacula() {
-
-   echo "CN: Dodajem pinning ocsinventory-agenta na inačicu 2:2.0.4..."
-   PINFILE=/etc/apt/preferences.d/99-carnet
+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
 
+EOF
 
 }
 
@@ -991,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