Просмотр исходного кода

Fix mutiple issues with restore

#1545 Additional FTP users  are now able to create files
#1739 Path get lost ( Other issue is fixed asswell)
#1723 $new_user got appended where it was not needed
Jaap Marcus 4 лет назад
Родитель
Сommit
792eb9458a
1 измененных файлов с 10 добавлено и 12 удалено
  1. 10 12
      bin/v-restore-user

+ 10 - 12
bin/v-restore-user

@@ -287,12 +287,6 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
                 FTP_USER="${user}_${FTP_USER}"
                 FTP_USER="${user}_${FTP_USER}"
             fi
             fi
 
 
-            # Converting stats users
-            if [ ! -z "$STATS_USER" ]; then
-                STATS_USER=$(echo "$STATS_USER"  |sed -e "s/${old_user}_//")
-                STATS_USER="${user}_${STATS_USER}"
-            fi
-
             # Copying SSL certificates
             # Copying SSL certificates
             if [ "$SSL" = 'yes' ]; then
             if [ "$SSL" = 'yes' ]; then
 
 
@@ -309,7 +303,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
                     done
                     done
                 fi
                 fi
             fi
             fi
-
+            
             # Merging web.conf keys
             # Merging web.conf keys
             str="DOMAIN='$domain' IP='$IP' IP6='$IP6' ALIAS='$ALIAS'"
             str="DOMAIN='$domain' IP='$IP' IP6='$IP6' ALIAS='$ALIAS'"
             str="$str CUSTOM_DOCROOT='$CUSTOM_DOCROOT' CUSTOM_PHPROOT='$CUSTOM_PHPROOT'"
             str="$str CUSTOM_DOCROOT='$CUSTOM_DOCROOT' CUSTOM_PHPROOT='$CUSTOM_PHPROOT'"
@@ -317,7 +311,8 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
             str="$str FASTCGI_CACHE='$FASTCGI_CACHE' FASTCGI_DURATION='$FASTCGI_DURATION'"
             str="$str FASTCGI_CACHE='$FASTCGI_CACHE' FASTCGI_DURATION='$FASTCGI_DURATION'"
             str="$str TPL='$TPL' SSL='$SSL' SSL_HOME='$SSL_HOME'"
             str="$str TPL='$TPL' SSL='$SSL' SSL_HOME='$SSL_HOME'"
             str="$str LETSENCRYPT='$LETSENCRYPT' FTP_USER='$FTP_USER'"
             str="$str LETSENCRYPT='$LETSENCRYPT' FTP_USER='$FTP_USER'"
-            str="$str FTP_MD5='$FTP_MD5' BACKEND='$BACKEND' PROXY='$PROXY'"
+            str="$str FTP_MD5='$FTP_MD5' FTP_PATH='$FTP_PATH'"
+            str="$str BACKEND='$BACKEND' PROXY='$PROXY'"
             str="$str PROXY_EXT='$PROXY_EXT' STATS='$STATS'"
             str="$str PROXY_EXT='$PROXY_EXT' STATS='$STATS'"
             str="$str STATS_USER='$STATS_USER' STATS_CRYPT='$STATS_CRYPT'"
             str="$str STATS_USER='$STATS_USER' STATS_CRYPT='$STATS_CRYPT'"
             str="$str U_DISK='$U_DISK' U_BANDWIDTH='0' SUSPENDED='no'"
             str="$str U_DISK='$U_DISK' U_BANDWIDTH='0' SUSPENDED='no'"
@@ -328,11 +323,11 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
             if [ ! -z "$WEB_BACKEND" ]; then
             if [ ! -z "$WEB_BACKEND" ]; then
                 $BIN/v-add-web-domain-backend $user $domain $BACKEND
                 $BIN/v-add-web-domain-backend $user $domain $BACKEND
             fi
             fi
-
-            # Rebuilding vhost
-            rebuild_web_domain_conf
         fi
         fi
-
+                
+        # Rebuilding vhost
+        rebuild_web_domain_conf
+        
         # Restoring web domain data
         # Restoring web domain data
         if [ -d "$HOMEDIR/$user/web/$domain/public_html" ]; then
         if [ -d "$HOMEDIR/$user/web/$domain/public_html" ]; then
             rm -rf $HOMEDIR/$user/web/$domain/public_html/*
             rm -rf $HOMEDIR/$user/web/$domain/public_html/*
@@ -365,6 +360,9 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
             find $HOMEDIR/$user/web/$domain/ -user $old_uid \
             find $HOMEDIR/$user/web/$domain/ -user $old_uid \
                 -exec chown -h $user:$user {} \;
                 -exec chown -h $user:$user {} \;
         fi
         fi
+        
+        # Rebuilding vhost
+        rebuild_web_domain_conf
     done
     done
 
 
     # Adding user to traffic queue
     # Adding user to traffic queue