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

Change $VESTA to $HESTIA after patch from source.

Raphael Schneeberger 7 лет назад
Родитель
Сommit
e41355db5a
3 измененных файлов с 16 добавлено и 16 удалено
  1. 3 3
      bin/v-backup-users
  2. 11 11
      bin/v-list-users
  3. 2 2
      bin/v-update-user-stats

+ 3 - 3
bin/v-backup-users

@@ -28,12 +28,12 @@ fi
 for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
     check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
     log=$HESTIA/log/backup.log
-    if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then
+    if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then
         continue;
     fi
     wait_for_backup_if_it_is_not_time_for_backup
-    check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
-    log=$VESTA/log/backup.log
+    check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
+    log=$HESTIA/log/backup.log
     if [ ! -z "$check_suspend" ]; then
         echo -e "================================" >> $log
         echo -e "$user" >> $log

+ 11 - 11
bin/v-list-users

@@ -18,13 +18,13 @@ json_list() {
     i=1
     while read USER; do
         source $HESTIA/data/users/$USER/user.conf
-        if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
+        if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
             continue;
         fi
         if [ $i -gt 1 ]; then
             echo ","
         fi
-        source $VESTA/data/users/$USER/user.conf
+        source $HESTIA/data/users/$USER/user.conf
         echo -n '    "'$USER'": {
         "FNAME": "'$FNAME'",
         "LNAME": "'$LNAME'",
@@ -91,10 +91,10 @@ shell_list() {
     echo "----   ---   ---   ---   ---    --   ----   --   ----   ----"
     while read USER; do
         source $HESTIA/data/users/$USER/user.conf
-        if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
+        if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
             continue;
         fi
-        source $VESTA/data/users/$USER/user.conf
+        source $HESTIA/data/users/$USER/user.conf
         echo -n "$USER $PACKAGE $U_WEB_DOMAINS $U_DNS_DOMAINS $U_MAIL_DOMAINS"
         echo " $U_DATABASES $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
     done < <(grep '@' /etc/passwd |cut -f1 -d:)
@@ -104,10 +104,10 @@ shell_list() {
 plain_list() {
     while read USER; do
         source $HESTIA/data/users/$USER/user.conf
-        if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
+        if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
             continue;
         fi
-        source $VESTA/data/users/$USER/user.conf
+        source $HESTIA/data/users/$USER/user.conf
         echo -ne "$USER\t$FNAME\t$LNAME\t$PACKAGE\t$WEB_TEMPLATE\t"
         echo -ne "$BACKEND_TEMPLATE\t$PROXY_TEMPLATE\t$DNS_TEMPLATE\t"
         echo -ne "$WEB_DOMAINS\t$WEB_ALIASES\t$DNS_DOMAINS\t$DNS_RECORDS\t"
@@ -140,10 +140,10 @@ csv_list() {
     echo "U_CRON_JOBS,U_BACKUPS,LANGUAGE,TIME,DATE"
     while read USER; do
         source $HESTIA/data/users/$USER/user.conf
-        if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
+        if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
             continue;
         fi
-        source $VESTA/data/users/$USER/user.conf
+        source $HESTIA/data/users/$USER/user.conf
         echo -n "$USER,\"$FNAME\",\"$LNAME\",$PACKAGE,$WEB_TEMPLATE,"
         echo -n "$BACKEND_TEMPLATE,$PROXY_TEMPLATE,$DNS_TEMPLATE,"
         echo -n "$WEB_DOMAINS,$WEB_ALIASES,$DNS_DOMAINS,$DNS_RECORDS,"
@@ -165,11 +165,11 @@ raw_list() {
     while read USER; do
         echo $HESTIA/data/users/$USER/user.conf
         cat $HESTIA/data/users/$USER/user.conf
-        if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
+        if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
             continue;
         fi
-        echo $VESTA/data/users/$USER/user.conf
-        cat $VESTA/data/users/$USER/user.conf
+        echo $HESTIA/data/users/$USER/user.conf
+        cat $HESTIA/data/users/$USER/user.conf
     done < <(grep '@' /etc/passwd |cut -f1 -d:)
 }
 

+ 2 - 2
bin/v-update-user-stats

@@ -68,10 +68,10 @@ TOTAL_USERS=0
 # Updating user stats
 for user in $user_list; do
     USER_DATA=$HESTIA/data/users/$user
-    if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then
+    if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then
         continue;
     fi
-    USER_DATA=$VESTA/data/users/$user
+    USER_DATA=$HESTIA/data/users/$user
     source $USER_DATA/user.conf
     next_month=$(date +'%m/01/%y' -d '+ 1 month')
     DATE=$(date -d "$next_month -1day" +%F)