|
|
@@ -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:)
|
|
|
}
|
|
|
|