Skip to content

Commit 2545b45

Browse files
committed
Added reset key support
1 parent 5458c49 commit 2545b45

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

bin/v_add_sys_user

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ $package_data
134134
SUSPENDED='no'
135135
CONTACT='$email'
136136
REPORTS='yes'
137+
RKEY='$(gen_password)'
137138
IP_OWNED='0'
138139
U_DIR_DISK='0'
139140
U_DISK='0'

bin/v_change_sys_user_password

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ echo "$password" | /usr/bin/passwd "$user" --stdin >/dev/null 2>&1
4444
# Vesta #
4545
#----------------------------------------------------------#
4646

47+
# Changing RKEY value
48+
update_user_value "$user" '$RKEY' "$(gen_password)"
49+
4750
# Hiding password
4851
V_EVENT="$V_DATE $V_SCRIPT $user *****"
4952

bin/v_list_sys_user

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ conf=$V_USERS/$user/user.conf
9696
# Defining fileds to select
9797
fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES
9898
$DATABASES $MAIL_DOMAINS $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS
99-
$DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $WEB_TPL $SUSPENDED $IP_OWNED
100-
$U_DISK $U_BANDWIDTH $U_WEB_DOMAINS $U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES
101-
$U_MAIL_DOMAINS $CONTACT $DATE'
99+
$DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $WEB_TPL $SUSPENDED $CONTACT
100+
$RKEY $REPORTS $IP_OWNED $U_DIR_DISK $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS
101+
$U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES $U_MAIL_DOMAINS $DATE'
102102

103103
# Listing user
104104
case $format in

bin/v_list_sys_users

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ shell_list_users() {
9393
fields="\$USER \$FNAME \$LNAME \$PACKAGE \$WEB_DOMAINS \$WEB_SSL \$WEB_ALIASES"
9494
fields="$fields \$DATABASES \$MAIL_DOMAINS \$MAIL_BOXES \$MAIL_FORWARDERS"
9595
fields="$fields \$DNS_DOMAINS \$DISK_QUOTA \$BANDWIDTH \$NS \$SHELL \$BACKUPS"
96-
fields="$fields \$WEB_TPL \$SUSPENDED \$IP_OWNED \$U_DISK \$U_BANDWIDTH"
97-
fields="$fields \$U_WEB_DOMAINS \$U_WEB_SSL \$U_DNS_DOMAINS \$U_DATABASES"
98-
fields="$fields \$U_MAIL_DOMAINS \$CONTACT \$DATE"
96+
fields="$fields \$WEB_TPL \$SUSPENDED \$CONTACT \$RKEY \$REPORTS \$IP_OWNED"
97+
fields="$fields \$U_DIR_DISK \$U_DISK \$U_BANDWIDTH \$U_WEB_DOMAINS"
98+
fields="$fields \$U_WEB_SSL \$U_DNS_DOMAINS \$U_DATABASES \$U_MAIL_DOMAINS"
99+
fields="$fields \$DATE"
99100

100101
# Listing domains
101102
case $format in

func/shared.func

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,3 +1053,13 @@ is_backup_enabled() {
10531053
exit $E_BACKUP_DISABLED
10541054
fi
10551055
}
1056+
1057+
gen_password() {
1058+
MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
1059+
LENGTH=10
1060+
while [ ${n:=1} -le $LENGTH ]; do
1061+
PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
1062+
let n+=1
1063+
done
1064+
echo "$PASS"
1065+
}

0 commit comments

Comments
 (0)