Skip to content

Commit 77e6993

Browse files
asmccasmccjaapmarcus
authored
Replace bin/v-list-sys-users by bin/v-list-users (hestiacp#3930)
* v-list-sys-users replace by v-list-users * Replace v-list-sys-users by v-list-users. Part 2 * v-list-users with new list option * Remove raw_list option Not used every where * Add notice and use v-list-users list instead --------- Co-authored-by: asmcc <root@7-www.tk> Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
1 parent dba8f5f commit 77e6993

22 files changed

+43
-42
lines changed

‎bin/v-add-remote-dns-host‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ cluster_cmd v-add-cron-restart-job
104104
check_result $? "$HOST connection failed" "$E_CONNECT"
105105

106106
# Loop trough domains to generate new serial
107-
for dns_user in $($BIN/v-list-sys-users plain); do
107+
for dns_user in $("$BIN/v-list-users" list); do
108108
for dns_domain in $($BIN/v-list-dns-domains $dns_user plain | cut -f1); do
109109
$BIN/v-rebuild-dns-domain $dns_user $dns_domain "no" "yes"
110110
done

‎bin/v-add-sys-ip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ syshealth_adapt_nginx_resolver
211211
increase_user_value "$user" '$IP_OWNED'
212212
if [ "$user" = $ROOT_USER ]; then
213213
if [ "$ip_status" = 'shared' ]; then
214-
for hestia_user in $($BIN/v-list-sys-users plain); do
214+
for hestia_user in $("$BIN/v-list-users" list); do
215215
increase_user_value "$hestia_user" '$IP_AVAIL'
216216
done
217217
else

‎bin/v-add-sys-quota‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ else
9090
fi
9191

9292
# Rebuilding user quota
93-
for user in $($BIN/v-list-sys-users plain); do
94-
$BIN/v-update-user-quota "$user"
93+
for user in $("$BIN/v-list-users" list); do
94+
"$BIN/v-update-user-quota" "$user"
9595
done
9696

9797
#----------------------------------------------------------#

‎bin/v-backup-users‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mysqlrepair --all-databases --check --auto-repair > /dev/null 2>&1
3131
if [ -z "$BACKUP_SYSTEM" ]; then
3232
exit
3333
fi
34-
for user in $($BIN/v-list-sys-users plain); do
34+
for user in $("$BIN/v-list-users" list); do
3535
check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
3636
log=$HESTIA/log/backup.log
3737
if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then

‎bin/v-change-sys-ip-nat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fi
5757

5858
# Updating WEB configs
5959
if [ -n "$old" ] && [ -n "$WEB_SYSTEM" ]; then
60-
for user in $($BIN/v-list-sys-users plain); do
60+
for user in $("$BIN/v-list-users" list); do
6161
sed -i "s/$old/$new/" $HESTIA/data/users/$user/web.conf
6262
$BIN/v-rebuild-web-domains "$user" no
6363
done
@@ -66,7 +66,7 @@ fi
6666

6767
# Updating DNS configs
6868
if [ -n "$old" ] && [ -n "$DNS_SYSTEM" ]; then
69-
for user in $($BIN/v-list-sys-users plain); do
69+
for user in $("$BIN/v-list-users" list); do
7070
sed -i "s/$old/$new/" "$HESTIA/data/users/$user/dns.conf"
7171
if ls $HESTIA/data/users/$user/dns/*.conf > /dev/null 2>&1; then
7272
sed -i "s/$old/$new/" $HESTIA/data/users/$user/dns/*.conf
@@ -95,10 +95,10 @@ if [ -n "$old" ] && [ -n "$FTP_SYSTEM" ]; then
9595
fi
9696
fi
9797
if [ "$FTP_SYSTEM" = 'proftpd' ]; then
98-
ext_ip_conf="/etc/$FTP_SYSTEM/conf.d/external_ip.conf"
99-
content="MasqueradeAddress ${nat_ip}"
100-
echo "$content" > "$ext_ip_conf"
101-
fi
98+
ext_ip_conf="/etc/$FTP_SYSTEM/conf.d/external_ip.conf"
99+
content="MasqueradeAddress ${nat_ip}"
100+
echo "$content" > "$ext_ip_conf"
101+
fi
102102
$BIN/v-restart-ftp "$restart"
103103
fi
104104

‎bin/v-change-sys-ip-owner‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ "$ip_owner" != "$user" ]; then
5151
decrease_user_value "$ip_owner" '$IP_OWNED'
5252
if [ "$ip_owner" = "$ROOT_USER" ]; then
5353
if [ "$ip_status" = 'shared' ]; then
54-
for hestia_user in $($BIN/v-list-sys-users plain); do
54+
for hestia_user in $("$BIN/v-list-users" list); do
5555
decrease_user_value "$hestia_user" '$IP_AVAIL'
5656
done
5757
else
@@ -65,7 +65,7 @@ if [ "$ip_owner" != "$user" ]; then
6565
increase_user_value "$user" '$IP_OWNED'
6666
if [ "$user" = "$ROOT_USER" ]; then
6767
if [ "$ip_status" = 'shared' ]; then
68-
for hestia_user in $($BIN/v-list-sys-users plain); do
68+
for hestia_user in $("$BIN/v-list-users" list); do
6969
increase_user_value "$hestia_user" '$IP_AVAIL'
7070
done
7171
else

‎bin/v-change-sys-language‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fi
6262

6363
# Update language for all existing users if specified
6464
if [ "$update_users" = "yes" ]; then
65-
for user in $($BIN/v-list-sys-users plain); do
65+
for user in $("$BIN/v-list-users" list); do
6666
$BIN/v-change-user-language "$user" "$language"
6767
done
6868
fi

‎bin/v-change-sys-php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ php_fpm="/etc/init.d/php$version-fpm"
4747
rm -f /etc/php/*/fpm/pool.d/www.conf
4848
cp -f $HESTIA/install/deb/php-fpm/www.conf /etc/php/$version/fpm/pool.d/www.conf
4949

50-
for user in $($BIN/v-list-sys-users plain); do
50+
for user in $("$BIN/v-list-users" list); do
5151
$BIN/v-rebuild-web-domains "$user" 'no' > /dev/null 2>&1
5252
$BIN/v-rebuild-mail-domains "$user" 'no' > /dev/null 2>&1
5353
done

‎bin/v-change-sys-webmail‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ check_hestia_demo_mode
3535
#----------------------------------------------------------#
3636

3737
# Delete old webmail configuration
38-
for user in $($BIN/v-list-sys-users plain); do
38+
for user in $("$BIN/v-list-users" list); do
3939
for domain in $($BIN/v-list-mail-domains "$user" plain | cut -f 1); do
4040
$BIN/v-delete-mail-domain-webmail "$user" "$domain"
4141
done
@@ -45,7 +45,7 @@ done
4545
$BIN/v-change-sys-config-value 'WEBMAIL_ALIAS' $NEW_ALIAS
4646

4747
# Add new webmail configuration
48-
for user in $($BIN/v-list-sys-users plain); do
48+
for user in $("$BIN/v-list-users" list); do
4949
for domain in $($BIN/v-list-mail-domains "$user" plain | cut -f 1); do
5050
$BIN/v-add-mail-domain-webmail "$user" "$domain"
5151
done

‎bin/v-delete-sys-ip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ fi
139139

140140
if [ "$OWNER" = "$ROOT_USER" ]; then
141141
if [ "$STATUS" = 'shared' ]; then
142-
for hestia_user in $($BIN/v-list-sys-users plain); do
142+
for hestia_user in $("$BIN/v-list-users" list); do
143143
decrease_user_value "$hestia_user" '$IP_AVAIL'
144144
done
145145
else

0 commit comments

Comments
 (0)