X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=373422c6da006c9cbb254ff38ab5b6d5ae18ea76;hb=c20fbc944f5dc2ced8cacb90b79a2c6417151257;hp=4a5de69a1fe34b3463ebf958c08b0102eb4e8814;hpb=56096584dd72fb5ffc39832f5c159628d3a45190;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 4a5de69..373422c 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -868,11 +868,11 @@ pkgupgrade () {
   fi
 }
 
-# upgrade apache2/php5
+# upgrade apache2/pthp5
 upgrade_apache2 () {
   pkgrm apache-common # prevents installation of apache2-suexec
-  pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
-    php5-odbc mod-security-cn
+  pkgupgrade libapache2-mod-php7.0 php7.0-cli php7.0-cn apache2-cn \
+    php7.0-odbc mod-security-cn
 }
 
 upgrade_amavis () {
@@ -908,12 +908,14 @@ upgrade_amavis () {
   /etc/init.d/amavis restart
 }
 
-# handle mysql 5.0 to 5.1 upgrade
+# handle mysql upgrade
 upgrade_mysql () {
-  if pkg mysql-server || pkg mysql-server-5.1; then
-     pkgadd mysql-server
-     dpkg -P mysql-server-5.1
-     /etc/init.d/mysql restart
+  if pkg mysql-server || pkg mysql-server-5.5 || \
+     pkg mariadb-server || pkg mariadb-server-10.0
+  then
+     pkgadd default-mysql-server
+     dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0
+     service mysql restart
   fi
 }
 
@@ -935,6 +937,18 @@ upgrade_postfix () {
 
 # upgrade the IMAP server
 upgrade_dovecot() {
+ # Funkcija koju je dodao Valentin da popravi propuste u dovecot-cn
+ # Mičem zaostale konfiguracije iz conf.d i izlazim
+
+ 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
+   
+ return 0
+
+
+
   local local_conf=/etc/dovecot/conf.d/95-${backup_ext}.conf
 
   if [ -f /etc/dovecot/conf.d/95-local -a ! -f $local_conf ]; then