Browse Source

removed backup.pipe and renamed reseller.conf to child.conf

Serghey Rodin 14 năm trước cách đây
mục cha
commit
27a59703a0
3 tập tin đã thay đổi với 4 bổ sung12 xóa
  1. 1 5
      bin/v_add_sys_user
  2. 3 3
      bin/v_backup_sys_user
  3. 0 4
      bin/v_upd_sys_queue

+ 1 - 5
bin/v_add_sys_user

@@ -143,10 +143,6 @@ if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
     touch $V_USERS/$user/cron.conf
 fi
 
-if [ ! -z "$BACKUP_SYSTEM" ] && [ "$BACKUP_SYSTEM" != 'no' ]; then
-    echo "v_backup_sys_user $user" >> $V_QUEUE/backup.pipe
-fi
-
 # Filling user config
 echo "FNAME='$fname'
 LNAME='$lname'
@@ -172,7 +168,7 @@ DATE='$V_DATE'" > $V_USERS/$user/user.conf
 # Filling owner config
 ROLE=$(echo "$role" | tr "[:lower:]" "[:upper:]")
 if [ "$user" != 'vesta' ]; then
-    echo "$ROLE='$user'" >> $V_USERS/$owner/reseller.conf
+    echo "$ROLE='$user'" >> $V_USERS/$owner/child.conf
     increase_user_value "$owner" 'U_CHILDS'
 fi
 

+ 3 - 3
bin/v_backup_sys_user

@@ -368,12 +368,12 @@ if [ -e "$V_USERS/$user/billing.log" ]; then
     cp -r $V_USERS/$user/billing.log $tmpdir/vesta/
 fi
 
-if [ -e "$V_USERS/$user/reseller.conf" ]; then
+if [ -e "$V_USERS/$user/child.conf" ]; then
     if [ -z "$output" ]; then
-        echo -e "\t$(date +%H:%m:%S) reseller.conf"
+        echo -e "\t$(date +%H:%m:%S) child.conf"
     fi
 
-    cp -r $V_USERS/$user/reseller.conf $tmpdir/vesta/
+    cp -r $V_USERS/$user/child.conf $tmpdir/vesta/
 fi
 
 if [ -e "$V_USERS/$user/history.log" ]; then

+ 0 - 4
bin/v_upd_sys_queue

@@ -47,10 +47,6 @@ stats_pipe() {
     bash $V_QUEUE/stats.pipe
 }
 
-backup_pipe() {
-    bash $V_QUEUE/backup.pipe
-}
-
 disk_pipe() {
     bash $V_QUEUE/disk.pipe
 }