Change order update steps (#2317)

* Change order update steps

- Hestia templates
- Filemanger
- Rainloop
- Roundcube 
- phpMyAdmin
- PHPMailer

- Fix bug in backup config files where Rainloop copied Roundcube config

- Update upgrade message RC

* Improve message

func/upgrade.sh

@@ -481,7 +481,7 @@ upgrade_start_backup() {
         if [ "$DEBUG_MODE" = "true" ]; then
             echo "      ---- Rainloop"
         fi
-        cp -fr /etc/roundcube/* $HESTIA_BACKUP/conf/roundcube
+        cp -fr /etc/rainloop/* $HESTIA_BACKUP/conf/rainloop
     fi
     if [ -d "/etc/phpmyadmin" ]; then
         if [ "$DEBUG_MODE" = "true" ]; then
@@ -632,7 +632,8 @@ upgrade_filemanager() {
 upgrade_roundcube(){
     if [ -n "$(echo "$WEBMAIL_SYSTEM" | grep -w 'roundcube')" ]; then
         if [ -d "/usr/share/roundcube" ]; then
-            echo "[ * ] Roundcube: Unable to update. Updates are managed by apt.";
+            echo "[ ! ] Roundcube: Updates are currently managed using the apt package manager";
+            echo "      To upgrade to the latest version of Roundcube directly from upstream, from please run the command migrate_roundcube.sh located in: /usr/local/hestia/install/upgrade/manual/"
         else
             rc_version=$(cat /var/lib/roundcube/index.php | grep -o -E '[0-9].[0-9].[0-9]+' | head -1);
             if [ "$rc_version" != "$rc_v" ]; then

src/deb/hestia/postinst

@@ -65,9 +65,6 @@ upgrade_start_routine | tee -a $LOG
 # Run upgrades of dependencies
 source_conf "$HESTIA_BACKUP/upgrade.conf"
 
-# Upgrade File Manager and update configuration
-upgrade_filemanager | tee -a $LOG
-
 # Update Web domain templates
 upgrade_rebuild_web_templates | tee -a $LOG
 
@@ -77,18 +74,21 @@ upgrade_rebuild_mail_templates | tee -a $LOG
 # Update DNS zone templates
 upgrade_rebuild_dns_templates | tee -a $LOG
 
-# Upgrade phpMyAdmin if applicable
-upgrade_phpmyadmin | tee -a $LOG
-
-# Upgrade Roundcube if applicable
-upgrade_roundcube | tee -a $LOG
+# Upgrade File Manager and update configuration
+upgrade_filemanager | tee -a $LOG
 
 # Upgrade Rainloop if applicable
 upgrade_rainloop | tee -a $LOG
 
+# Upgrade Roundcube if applicable
+upgrade_roundcube | tee -a $LOG
+
 # Upgrade PHPMailer if applicable
 upgrade_phpmailer | tee -a $LOG
 
+# Upgrade phpMyAdmin if applicable
+upgrade_phpmyadmin | tee -a $LOG
+
 # Set new version number in hestia.conf
 upgrade_set_version $new_version
 upgrade_set_branch $new_version