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 () {
# 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