@@ -18,13 +18,13 @@ json_list() {
1818 i=1
1919 while read USER; do
2020 source $HESTIA /data/users/$USER /user.conf
21- if [ ! -f " $VESTA /data/users/$USER /user.conf" ]; then
21+ if [ ! -f " $HESTIA /data/users/$USER /user.conf" ]; then
2222 continue ;
2323 fi
2424 if [ $i -gt 1 ]; then
2525 echo " ,"
2626 fi
27- source $VESTA /data/users/$USER /user.conf
27+ source $HESTIA /data/users/$USER /user.conf
2828 echo -n ' "' $USER ' ": {
2929 "FNAME": "' $FNAME ' ",
3030 "LNAME": "' $LNAME ' ",
@@ -91,10 +91,10 @@ shell_list() {
9191 echo " ---- --- --- --- --- -- ---- -- ---- ----"
9292 while read USER; do
9393 source $HESTIA /data/users/$USER /user.conf
94- if [ ! -f " $VESTA /data/users/$USER /user.conf" ]; then
94+ if [ ! -f " $HESTIA /data/users/$USER /user.conf" ]; then
9595 continue ;
9696 fi
97- source $VESTA /data/users/$USER /user.conf
97+ source $HESTIA /data/users/$USER /user.conf
9898 echo -n " $USER $PACKAGE $U_WEB_DOMAINS $U_DNS_DOMAINS $U_MAIL_DOMAINS "
9999 echo " $U_DATABASES $U_DISK $U_BANDWIDTH $SUSPENDED $DATE "
100100 done < <( grep ' @' /etc/passwd | cut -f1 -d:)
@@ -104,10 +104,10 @@ shell_list() {
104104plain_list () {
105105 while read USER; do
106106 source $HESTIA /data/users/$USER /user.conf
107- if [ ! -f " $VESTA /data/users/$USER /user.conf" ]; then
107+ if [ ! -f " $HESTIA /data/users/$USER /user.conf" ]; then
108108 continue ;
109109 fi
110- source $VESTA /data/users/$USER /user.conf
110+ source $HESTIA /data/users/$USER /user.conf
111111 echo -ne " $USER \t$FNAME \t$LNAME \t$PACKAGE \t$WEB_TEMPLATE \t"
112112 echo -ne " $BACKEND_TEMPLATE \t$PROXY_TEMPLATE \t$DNS_TEMPLATE \t"
113113 echo -ne " $WEB_DOMAINS \t$WEB_ALIASES \t$DNS_DOMAINS \t$DNS_RECORDS \t"
@@ -140,10 +140,10 @@ csv_list() {
140140 echo " U_CRON_JOBS,U_BACKUPS,LANGUAGE,TIME,DATE"
141141 while read USER; do
142142 source $HESTIA /data/users/$USER /user.conf
143- if [ ! -f " $VESTA /data/users/$USER /user.conf" ]; then
143+ if [ ! -f " $HESTIA /data/users/$USER /user.conf" ]; then
144144 continue ;
145145 fi
146- source $VESTA /data/users/$USER /user.conf
146+ source $HESTIA /data/users/$USER /user.conf
147147 echo -n " $USER ,\" $FNAME \" ,\" $LNAME \" ,$PACKAGE ,$WEB_TEMPLATE ,"
148148 echo -n " $BACKEND_TEMPLATE ,$PROXY_TEMPLATE ,$DNS_TEMPLATE ,"
149149 echo -n " $WEB_DOMAINS ,$WEB_ALIASES ,$DNS_DOMAINS ,$DNS_RECORDS ,"
@@ -165,11 +165,11 @@ raw_list() {
165165 while read USER; do
166166 echo $HESTIA /data/users/$USER /user.conf
167167 cat $HESTIA /data/users/$USER /user.conf
168- if [ ! -f " $VESTA /data/users/$USER /user.conf" ]; then
168+ if [ ! -f " $HESTIA /data/users/$USER /user.conf" ]; then
169169 continue ;
170170 fi
171- echo $VESTA /data/users/$USER /user.conf
172- cat $VESTA /data/users/$USER /user.conf
171+ echo $HESTIA /data/users/$USER /user.conf
172+ cat $HESTIA /data/users/$USER /user.conf
173173 done < <( grep ' @' /etc/passwd | cut -f1 -d:)
174174}
175175
0 commit comments