Skip to content

Commit 8a91c6e

Browse files
very-twivery-twi
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents d876168 + 7bf4668 commit 8a91c6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+990
-875
lines changed

‎bin/v_add_sys_ip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ iconf='/etc/sysconfig/network-scripts/ifcfg'
6262
rconf='/etc/httpd/conf.d/rpaf.conf'
6363

6464
# Adding ip
65-
ifconfig "$iface" "$ip" netmask "$mask"
65+
/sbin/ifconfig "$iface" "$ip" netmask "$mask"
6666

6767
# Adding startup script
6868
ip_add_startup

‎bin/v_add_sys_user‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@ source $VESTA/conf/vars.conf
1818
source $V_CONF/vesta.conf
1919
source $V_FUNC/shared.func
2020

21+
is_user_free() {
22+
# Parsing domain values
23+
check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" )
24+
25+
# Checking result
26+
if [ ! -z "$check_sysuser" ] || [ -e "$V_USERS/$user" ]; then
27+
echo "Error: user $user exist"
28+
log_event 'debug' "$E_EXISTS $V_EVENT"
29+
exit $E_EXISTS
30+
fi
31+
}
32+
2133

2234
#----------------------------------------------------------#
2335
# Verifications #

‎bin/v_add_sys_user_reports‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ is_user_valid
3131
# Checking user is active
3232
is_user_suspended
3333

34-
# Checking reports existance
35-
is_user_key_empty '$REPORTS'
36-
3734

3835
#----------------------------------------------------------#
3936
# Action #

‎bin/v_add_web_domain_stat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ format_validation 'user' 'domain'
3030

3131
# Checking web system is enabled
3232
is_system_enabled 'web'
33-
check_func_result $?
3433

3534
# Checking user
3635
is_user_valid "$user"

‎bin/v_backup_sys_user‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ while [ "$la" -ge "$V_BACKUP_LA_LIMIT" ]; do
4646

4747
if [ "$i" -ge "15" ]; then
4848
echo "Error: LA is too high"
49-
log_event 'debug' "$E_LOAD_AVERAGE $V_EVENT"
50-
exit $E_LOAD_AVERAGE
49+
log_event 'debug' "$E_LA $V_EVENT"
50+
exit $E_LA
5151
fi
5252

5353
(( ++i))
@@ -367,8 +367,8 @@ local_backup(){
367367
disk_usage=$(df $V_BACKUP | awk '{print $5}'|tail -n1|cut -f 1 -d '%')
368368
if [ "$disk_usage" -ge "$V_BACKUP_DISK_LIMIT" ]; then
369369
echo "Error: Not enough disk space"
370-
log_event 'debug' "$E_DISK_SPACE $V_EVENT"
371-
exit $E_DISK_SPACE
370+
log_event 'debug' "$E_DISK $V_EVENT"
371+
exit $E_DISK
372372
fi
373373

374374
# Creating final tarball
@@ -402,8 +402,8 @@ ftp_backup(){
402402
if [ -z "$HOST" ] || [ -z "$USERNAME" ] || [ -z "$PASSWORD" ] ||\
403403
[ -z "$BPATH" ]; then
404404
echo "Error: Parsing error"
405-
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
406-
exit $E_PARSE_ERROR
405+
log_event 'debug' "$E_PARSING $V_EVENT"
406+
exit $E_PARSING
407407
fi
408408

409409
# Debug info
@@ -417,8 +417,8 @@ ftp_backup(){
417417
rm $ftmpdir"
418418
if [ ! -z "$(ftpc "$command")" ] ; then
419419
echo "Error: FTP error"
420-
log_event 'debug' "$E_FTP_ERROR $V_EVENT"
421-
exit $E_FTP_ERROR
420+
log_event 'debug' "$E_FTP $V_EVENT"
421+
exit $E_FTP
422422
fi
423423

424424
# Checking retention

‎bin/v_change_sys_ip_owner‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user=$1
10-
ip=$2
9+
ip=$1
10+
user=$2
11+
1112

1213
# Importing variables
1314
source $VESTA/conf/vars.conf
@@ -21,10 +22,10 @@ source $V_FUNC/ip.func
2122
#----------------------------------------------------------#
2223

2324
# Checking arg number
24-
check_args '2' "$#" 'user ip'
25+
check_args '2' "$#" 'ip user'
2526

2627
# Checking argument format
27-
format_validation 'user' 'ip'
28+
format_validation 'ip' 'user'
2829

2930
# Checking user
3031
is_user_valid

‎bin/v_change_sys_ip_status‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ is_sys_ip_valid
3333
current_status=$(get_sys_ip_value '$STATUS')
3434
if [ "$ip_status" = "$current_status" ]; then
3535
echo "Error: status is already set"
36-
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
37-
exit $E_VALUE_EXIST
36+
log_event 'debug' "$E_EXISTS $V_EVENT"
37+
exit $E_EXISTS
3838
fi
3939

4040
# Parsing current ip usage
@@ -45,8 +45,8 @@ ip_owner=$(get_sys_ip_value '$OWNER')
4545
# Checking condition
4646
if [ "$web_domains" -ne '0' ] && [ "$sys_user" != "$ip_owner" ]; then
4747
echo "Error: ip is used"
48-
log_event 'debug' "$E_IP_USED $V_EVENT"
49-
exit $E_IP_USED
48+
log_event 'debug' "$E_INUSE $V_EVENT"
49+
exit $E_INUSE
5050
fi
5151

5252

‎bin/v_change_sys_user_package‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,89 @@ source $VESTA/conf/vars.conf
1414
source $V_CONF/vesta.conf
1515
source $V_FUNC/shared.func
1616

17+
is_package_avalable() {
18+
# Parsing user data
19+
usr_data=$(cat $V_USERS/$user/user.conf)
20+
for key in $usr_data; do
21+
eval ${key%%=*}=${key#*=}
22+
done
23+
24+
# Clearing vars
25+
WEB_DOMAINS='0'
26+
WEB_SSL='0'
27+
DATABASES='0'
28+
MAIL_DOMAINS='0'
29+
MAIL_BOXES='0'
30+
MAIL_FORWARDERS='0'
31+
DNS_DOMAINS='0'
32+
DISK_QUOTA='0'
33+
BANDWIDTH='0'
34+
35+
# Parsing package
36+
pkg_data=$(cat $V_PKG/$package.pkg)
37+
for key in $pkg_data; do
38+
eval ${key%%=*}=${key#*=}
39+
done
40+
41+
# Comparing user data with package
42+
if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ] ||\
43+
[ "$WEB_SSL" -lt "$U_WEB_SSL" ] ||\
44+
[ "$DATABASES" -lt "$U_DATABASES" ] ||\
45+
[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ] ||\
46+
[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ] ||\
47+
[ "$DISK_QUOTA" -lt "$U_DISK" ] ||\
48+
[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
49+
echo "Error: Upgrade package"
50+
log_event 'debug' "$E_LIMIT $v_log"
51+
exit $E_LIMIT
52+
fi
53+
}
54+
55+
change_user_package() {
56+
# Parsing user data
57+
usr_data=$(cat $V_USERS/$user/user.conf)
58+
for key in $usr_data; do
59+
eval ${key%%=*}=${key#*=}
60+
done
61+
62+
# Parsing package
63+
pkg_data=$(cat $V_PKG/$package.pkg)
64+
for key in $pkg_data; do
65+
eval ${key%%=*}=${key#*=}
66+
done
67+
68+
echo "FNAME='$FNAME'
69+
LNAME='$LNAME'
70+
PACKAGE='$package'
71+
WEB_DOMAINS='$WEB_DOMAINS'
72+
WEB_SSL='$WEB_SSL'
73+
WEB_ALIASES='$WEB_ALIASES'
74+
DATABASES='$DATABASES'
75+
MAIL_DOMAINS='$MAIL_DOMAINS'
76+
MAIL_BOXES='$MAIL_BOXES'
77+
MAIL_FORWARDERS='$MAIL_FORWARDERS'
78+
DNS_DOMAINS='$DNS_DOMAINS'
79+
DISK_QUOTA='$DISK_QUOTA'
80+
BANDWIDTH='$BANDWIDTH'
81+
NS='$NS'
82+
SHELL='$SHELL'
83+
BACKUPS='$BACKUPS'
84+
WEB_TPL='$WEB_TPL'
85+
SUSPENDED='$SUSPENDED'
86+
CONTACT='$CONTACT'
87+
REPORTS='$REPORTS'
88+
IP_OWNED='$IP_OWNED'
89+
U_DIR_DISK='$U_DIR_DISK'
90+
U_DISK='$U_DISK'
91+
U_BANDWIDTH='$U_BANDWIDTH'
92+
U_WEB_DOMAINS='$U_WEB_DOMAINS'
93+
U_WEB_SSL='$U_WEB_SSL'
94+
U_DNS_DOMAINS='$U_DNS_DOMAINS'
95+
U_DATABASES='$U_DATABASES'
96+
U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
97+
DATE='$DATE'" > $V_USERS/$user/user.conf
98+
}
99+
17100

18101
#----------------------------------------------------------#
19102
# Verifications #

‎bin/v_change_sys_user_shell‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ is_user_suspended
4040
update_user_value "$user" '$SHELL' "$shell"
4141

4242
# Get shell full path
43-
shell_path=$(get_shell_path)
43+
shell_path=$(/usr/bin/chsh --list-shells | grep -w "$shell" )
4444

4545
# Changing passwd file
4646
/usr/bin/chsh -s "$shell_path" "$user" >/dev/null 2>&1

‎bin/v_check_sys_user_password‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)