From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Tue, 27 Apr 2021 08:14:12 +0000 (+0200)
Subject: Fix grešaka
X-Git-Tag: debian/11.0.0~8
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=0d61ec643fce980d271cacd1b6dd866e01ef393c;p=carnet-upgrade.git

Fix grešaka
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index df38d7e..b174920 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -30,12 +30,15 @@ true				upgrade_syslog
 true				debconf_preload
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
+# by zelja, pinning na stare inačice
+pkg ocsinventory-agent-cn	fix_ocsinventory
+pkg bacula-cn			fix_bacula
+#
 pkg amavisd-new			upgrade_amavis
 true				upgrade_mysql
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
 pkg dovecot-cn			upgrade_dovecot
-pkg bacula-cn			fix_bacula
 pkg bind9-cn			upgrade_bind
 pkg fail2ban-cn			upgrade_fail2ban
 pkg mailman-cn			upgrade_mailman
diff --git a/src/functions.sh b/src/functions.sh
index 6f848af..95dc343 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,7 +949,6 @@ 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
 
@@ -965,16 +966,13 @@ Pin: version 7.4.4*
 Pin-Priority: 1001
 EOF
 
-
 }
 
 # pinning za ocsinventory da se na nadogradi sa 2.0.4 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.4..."
    test -f $PINFILE || touch $PINFILE
 
    cp-update ocsinventory-agent-cn $PINFILE <<EOF
@@ -983,7 +981,6 @@ Pin: version 2:2.0.5*
 Pin-Priority: 1001
 EOF
 
-
 }
 
 # upgrade the IMAP server