X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=427e1a4eea1573e93c8b9923cc675a00255a743a;hb=410f0690ae0b4341dded36a74f2a222611d28b6d;hp=3825a4c2c96cc95bc451364311c614f85630f678;hpb=5fe31b9531df1ee2f0b14881b126b33929eb5601;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 3825a4c..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,8 +965,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
 
 }
 
@@ -973,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
 
@@ -1086,7 +1105,7 @@ upgrade_syslog() {
   fi
 
   pkgadd rsyslog
-  dpkg -P sysklogd klogd
+  dpkg -P sysklogd klogd > /dev/null 2>&1
 }
 
 # restore munin configs for silent upgrade