X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=98fe327978dd38554865cd04db233ab2399764cc;hb=5036c2b87817f76ab042593f7160cf36685417f7;hp=9100f66ffd7be9e4fffc9be4d61226a3b523612b;hpb=e964d270202710e62bc22ada8cb664aba7082fac;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 9100f66..98fe327 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -2,6 +2,11 @@
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Zeljko Boros <zelja@carnet.hr>
 
+PHPVER="7.3"
+MDB="10.3"
+PINFILE="/etc/apt/preferences.d/99-carnet"
+
+
 notice () {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
 }
@@ -869,11 +874,12 @@ pkgupgrade () {
   fi
 }
 
-# upgrade apache2/pthp5
+# upgrade apache2/php
 upgrade_apache2 () {
-  pkgrm apache-common # prevents installation of apache2-suexec
-  pkgupgrade libapache2-mod-php7.0 php7.0-cli php7.0-cn apache2-cn \
-    php7.0-odbc mod-security-cn
+### ne treba od etcha
+### pkgrm apache-common # prevents installation of apache2-suexec
+  pkgupgrade libapache2-mod-php$PHPVER php$PHPVER-cli php$PHPVER-cn apache2-cn \
+    php$PHPVER-odbc mod-security-cn
 }
 
 upgrade_amavis () {
@@ -912,10 +918,10 @@ upgrade_amavis () {
 # handle mysql upgrade
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.5 || \
-     pkg mariadb-server || pkg mariadb-server-10.0
+     pkg mariadb-server || pkg mariadb-server-$MDB
   then
      pkgadd default-mysql-server
-     dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0
+     dpkg -P mysql-server mysql-server-5.5 mariadb-server-$MDB
      service mysql restart
   fi
 }
@@ -943,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
 
@@ -961,6 +966,20 @@ 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_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
+Package: ocsinventory-agent
+Pin: version 2:2.0.5*
+Pin-Priority: 1001
+EOF
 
 }
 
@@ -969,10 +988,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
 
@@ -1082,7 +1101,7 @@ upgrade_syslog() {
   fi
 
   pkgadd rsyslog
-  dpkg -P sysklogd klogd
+  dpkg -P sysklogd klogd > /dev/null 2>&1
 }
 
 # restore munin configs for silent upgrade