Merge branch 'main' into release

Author: jaapmarcus

CHANGELOG.md

@@ -28,7 +28,13 @@ source_conf "$HESTIA/conf/hestia.conf"
 
 check_args '1' "$#" 'USER'
 is_format_valid 'user'
-is_object_valid 'user' 'USER' "$user" # Limit to only Hestia user(s)
+check=$(is_object_valid 'user' 'USER' "$user")
+if [ $? -ne 0 ]; then 
+    user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
+    #try to detect "owner" of the ftp_user if not found dont set it up
+    user=$(echo $user_str | cut -f6 -d : | cut -f3 -d / ) 
+    is_object_valid 'user' 'USER' "$user"
+fi 
 user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
 if [ -z "$user_str" ]; then
     exit

README.md

@@ -32,9 +32,8 @@ check_args '2' "$#" 'USER DATABASE'
 is_format_valid 'user' 'database'
 is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'db' 'DB' "$database"
-is_object_unsuspended 'db' 'DB' "$database"
+
 
 #----------------------------------------------------------#
 #                       Action                             #

bin/v-add-user-sftp-jail

@@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user"
 #----------------------------------------------------------#
 
 # Starting update loop
-for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do
+for database in $($BIN/v-list-databases $user plain | cut -f 1); do
     $BIN/v-update-database-disk "$user" "$database"
 done
 

bin/v-update-database-disk

@@ -36,9 +36,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 if [ -z "$MAIL_SYSTEM" ] || [ "$MAIL_SYSTEM" = 'remote' ]; then
     exit
 fi
@@ -49,7 +47,7 @@ fi
 
 # Starting loop
 dom_disk=0
-for account in $(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT'); do
+for account in $($BIN/v-list-mail-accounts $user $domain plain | cut -f 1); do
     home_dir=$HOMEDIR/$user/mail/$domain/$account
     if [ -e "$home_dir" ]; then
         udisk=$(nice -n 19 du -shm $home_dir | cut -f 1 )

bin/v-update-databases-disk

@@ -38,10 +38,9 @@ fi
 #----------------------------------------------------------#
 
 # Starting loop
-for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do
+for domain in $($BIN/v-list-mail-domains $user plain | cut -f 1); do
     dom_disk=0
-    accounts=$(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT')
-    for account in $accounts; do
+    for account in $($BIN/v-list-mail-accounts $user $domain plain | cut -f 1); do
         home_dir=$HOMEDIR/$user/mail/$domain/$account
         if [ -e "$home_dir" ]; then
             udisk=$(nice -n 19 du -shm $home_dir | cut -f 1 )

bin/v-update-mail-domain-disk

@@ -38,9 +38,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
 #----------------------------------------------------------#
 #                       Action                             #

bin/v-update-mail-domains-disk

@@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user"
 #----------------------------------------------------------#
 
 # Loop through all domains that are not suspended
-for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do
+for domain in $($BIN/v-list-web-domains $user plan | cut -f 1); do 
     home_dir="$HOMEDIR/$user/web/$domain/"
     if [ -e "$home_dir" ]; then
         disk_usage=$(nice -n 19 du -shm $home_dir | cut -f 1 )

bin/v-update-web-domain-disk

@@ -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