github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-05 12:36:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hotfixes for 0.9.7

Browse source
This commit is contained in:
Serghey Rodin 2012-04-18 12:06:35 +03:00
parent 20f200fbff
commit 2fe720fd06
10 changed files with 233 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_change_user_contact
View file

@ -33,7 +33,7 @@ is_object_unsuspended 'user' 'USER' "$user"
#----------------------------------------------------------#
# Changing user contact email
old_email=$get_user_value '$CONTACT')
old_email=$(get_user_value '$CONTACT')
update_user_value "$user" '$CONTACT' "$email"
pw_str=$(grep -n "^$user:" /etc/passwd)
str=$(echo "$pw_str" | cut -f 1 -d :)

1
bin/v_change_user_package
View file

@ -99,6 +99,7 @@ U_WEB_ALIASES='$U_WEB_ALIASES'
U_DNS_DOMAINS='$U_DNS_DOMAINS'
U_DNS_RECORDS='$U_DNS_RECORDS'
U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
U_MAIL_DKIM='$U_MAIL_DKIM'
U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
U_DATABASES='$U_DATABASES'
U_CRON_JOBS='$U_CRON_JOBS'

4
bin/v_list_users
View file

@ -30,9 +30,9 @@ json_list_users() {
else
if [ $i -lt $fileds_count ]; then
(( ++i))
echo -e "\t\t\"${field//$/}\": \"${value//,/, }\","
echo -e "\t\t\"${field//$/}\": \"$value\","
else
echo -e "\t\t\"${field//$/}\": \"${value//,/, }\""
echo -e "\t\t\"${field//$/}\": \"$value\""
data=1
fi
fi

2
bin/v_list_web_domains
View file

@ -36,7 +36,7 @@ conf=$USER_DATA/web.conf
# Defining fileds to select
fields="\$DOMAIN \$IP \$IP6 \$U_DISK \$U_BANDWIDTH \$TPL \$ALIAS \$PHP \$CGI"
fields="$fields \$ELOG \$STATS \$STATS_AUTH \$SSL \$SSL_HOME \$NGINX"
fields="$fields \$NGINX_EXT \$SUSPENDED \$DATE"
fields="$fields \$NGINX_EXT \$SUSPENDED \$TIME \$DATE"
# Listing domains
case $format in

4
bin/v_update_user_counters
View file

@ -52,12 +52,12 @@ for user in $user_list; do
IP_AVAIL=0
IP_OWNED=0
U_USERS=0
DISK=0
U_DISK=0
U_DISK_DIRS=$(get_user_value '$U_DISK_DIRS')
if [ -z "$U_DISK_DIRS" ]; then
U_DISK_DIRS=0
fi
DISK=$((DISK + U_DISK_DIRS))
U_DISK_WEB=0
U_DISK_MAIL=0
U_DISK_DB=0
@ -69,7 +69,7 @@ for user in $user_list; do
U_DNS_DOMAINS=0
U_DNS_RECORDS=0
U_MAIL_DOMAINS=0
U_MAIL_DKMI=0
U_MAIL_DKIM=0
U_MAIL_ACCOUNTS=0
U_DATABASES=0
U_CRON_JOBS=0

2
data/packages/default.pkg
View file

@ -1,6 +1,6 @@
WEB_DOMAINS='100'
WEB_ALIASES='100'
WEB_TPL='default,phpcgi,unlim,phpfcgid'
WEB_TPL='default,phpfcgi,unlim'
DNS_DOMAINS='100'
DNS_RECORDS='100'
MAIL_DOMAINS='100'

1
func/shared.sh
View file

@ -297,6 +297,7 @@ decrease_user_value() {
json_list() {
echo '{'
fileds_count=$(echo $fields| wc -w )
#for line in $(cat $conf); do
while read line; do
eval $line
if [ -n "$data_output" ]; then

22
test/ssl/crt Normal file
View file

@ -0,0 +1,22 @@
-----BEGIN CERTIFICATE-----
MIIDmjCCAoICCQCjpzusnGxWaDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
VVMxEjAQBgNVBAgMCUJlcmtzaGlyZTESMBAGA1UEBwwJV2VzdG5vcnRoMQ4wDAYD
VQQKDAVWZXN0YTELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGRlbW8udmVzdGFjcC5j
b20xHzAdBgkqhkiG9w0BCQEWEGluZm9AdmVzdGFjcC5jb20wHhcNMTExMjE0MTky
NDU4WhcNMTIxMjEzMTkyNDU4WjCBjjELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCUJl
cmtzaGlyZTESMBAGA1UEBwwJV2VzdG5vcnRoMQ4wDAYDVQQKDAVWZXN0YTELMAkG
A1UECwwCSVQxGTAXBgNVBAMMEGRlbW8udmVzdGFjcC5jb20xHzAdBgkqhkiG9w0B
CQEWEGluZm9AdmVzdGFjcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQC85/k6Ekfo1z9AfzOFNce0rgy897nlkdiEdr67H05lhFlUHY129vzgrrZC
kANji9sR0tGwcRdc2aHoTlbQGZ4f567LbWrUY0kc4ku56/5v74akf2P4HRm5AhSF
6RHJfisl558i/JuO9M+fwCp1r9oOicapcyMJzaSXIeDTudWalKzwCNISH3neA+jw
uJPFvw+NKtQoYHQN1ag24rmK1IUhdX70HverwS+DJykqEIcTMuON4FZ0UHx8Xr6U
3pQ9yhulHTQEU03vL353ONJ6SYxzZRnt6GdE+jN+AsSDo0P7mRPoUtvi6n1AeVS+
iSalLfZN0CEVxuMnjvA1I4DtPNZNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIft
cXO9VpxvdlItINllvy5jrOVYn/U8NKNO1TNcqeCQmg2PQHfx8WCK4q3RBVV5aAu4
87h6aTMH1YnxZfMtpMSZZi2FVQgeZsXs86UJu0jYXU06DApyL3G28w2LDwO/m1cw
8xtMpofALyzmS/YKuGv5ptWCR57mw5a/5fyscWdFc3xgmZZxm/gO1o9pLcotVkLg
H8dHFcQlqQbp2ejmvJmBdCgkNtgjdrJSVYQGsL1Ja/53S82NQD5LgDBq81kcbvqF
ikD0BTAwKY6sETo3xCRxfno3A9ZTw7byk/QRl++qK02WrMnDVbcj1xeZR866QIfZ
plL7FfrMTcBCs1S0Hwc=
-----END CERTIFICATE-----

27
test/ssl/key Normal file
View file

@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAvOf5OhJH6Nc/QH8zhTXHtK4MvPe55ZHYhHa+ux9OZYRZVB2N
dvb84K62QpADY4vbEdLRsHEXXNmh6E5W0BmeH+euy21q1GNJHOJLuev+b++GpH9j
+B0ZuQIUhekRyX4rJeefIvybjvTPn8Aqda/aDonGqXMjCc2klyHg07nVmpSs8AjS
Eh953gPo8LiTxb8PjSrUKGB0DdWoNuK5itSFIXV+9B73q8EvgycpKhCHEzLjjeBW
dFB8fF6+lN6UPcobpR00BFNN7y9+dzjSekmMc2UZ7ehnRPozfgLEg6ND+5kT6FLb
4up9QHlUvokmpS32TdAhFcbjJ47wNSOA7TzWTQIDAQABAoIBAHPgdB/sINIyXylo
HalkAPnTHhs4dn7dBQzUblEIdiWNluIjMqi7/wiwAzs3bey9WIdJY7kw1hztnwSK
MXR7kmSN0MoWd0aLFMk0AzGsEqqFKnlzb1Y+O44iOYafHnsT+tHIj/R9McryXv3m
eeUxFrh+SS+eYerci07tyCT4RJAJ/3RjQvlpZbZEkS/EF4lgg+V87CNF2hYzVIS0
obOXVMMl7TeAF56tJfFM2hjVS9lD7o7AmfpuMLirZ/HNscjx9MgUgPDTpCLQ+o5g
bV5QC5VdJtHKaH9H11CmOyl6FQp006dOzVfhxdblNSq8d9VYrLv3IF+j8MfvTxw1
nVUj8P0CgYEA3AggZ/EuAWBDdks3y9vTnJVoaHDjrO9j7ldqWU3UONYjYPupCWXG
LPxfFnHwifQBW2Yp0GrGoRI1Nz8wvZ1Q9JvziaWDSWfbUP/VtEL1N8QDQDemfh+p
vQ48rMJ0cWtRQWloTDWiRJ6S57+bUcIlXfBhieZ7fsnrL092cUS/f58CgYEA28lO
GLQA5KdiS0cDTCrzDP2ZnfPhsHEv+M0hIbjiULKkwJZkOHfp2byRJYakoT9Dnjwo
3N1gFqGyXeCunI2P2yxu7HsYdDUsrK16IjRDhrwm2Yi0qQdBVBdC8EtCOpgdMbPw
j+bavowW4sdZ+Cdt1UiXJW2inkVTeMn7u/82spMCgYEA1QPNE7PrPQvL4/8IAoVM
RYBjtxDraiXMUhcw70oo1emCEMcyq9Vq2WxuRhWCsJuYoLq0aoCk0ZUGDflQH5Ho
qRc93Blvk6ZHLhCv/LcCHb3XA9mchufydQQOe5Y6Ev+5h6EbhwQ5l0MJp/DY1nsl
n98zHsUS8/lZhdDhMuFCn7MCgYAvEkobmFGopwCyRp86LOipG5dO8PChLVys2KID
6ujth5Upegw029nFvFEJzHBt6HK+7PuDchYmQrNEz94VwWvR8Q5Ar4xpNwo+YVkL
Ak6ECL/5TwICQX+IVwMLG9MvYWy/PF6FM1gd/zrXjwKB10/6ofVdGsH9S7O45ul3
Ng2s6QKBgQDYFKzhN8vDDGhmhDIz0uAPaMkMUvsjFHvsuurboAHgLnOstXhc/M0N
t/AhI+TM+JewVoT6F4FGWOR6ykGn9F5N7e+rHfU+/6yloD4quDavV+4JWuJomRpC
QE0k8Pmgm3s5xo3kyb7J9h4l3b8MF2rXTzcqyG8UQMrSRjVUJ07scg==
-----END RSA PRIVATE KEY-----

200
test/test_actions.sh
View file

@ -45,56 +45,63 @@ done
tmpfile=$(mktemp -p /tmp )
#----------------------------------------------------------#
# User #
#----------------------------------------------------------#
# Add user
cmd="v_add_user $user $user $user@vestacp.com default Super Test"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding new user $user" "$?" "$tmpfile" "$cmd"
echo_result "USER: Adding new user $user" "$?" "$tmpfile" "$cmd"
# Change user password
cmd="v_change_user_password $user t3st_p4ssw0rd"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Changing password" "$?" "$tmpfile" "$cmd"
echo_result "USER: Changing password" "$?" "$tmpfile" "$cmd"
# Change user contact
cmd="v_change_user_contact $user tester@vestacp.com"
$cmd > $tmpfile 2>> $tmpfile
echo_result "USER: Changing email" "$?" "$tmpfile" "$cmd"
# Change system shell
cmd="v_change_user_shell $user bash"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Changing system shell to /bin/bash" "$?" "$tmpfile" "$cmd"
echo_result "USER: Changing system shell to /bin/bash" "$?" "$tmpfile" "$cmd"
# Change name servers
cmd="v_change_user_ns $user ns0.com ns1.com ns2.com ns3.com"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Changing nameservers" "$?" "$tmpfile" "$cmd"
echo_result "USER: Changing nameservers" "$?" "$tmpfile" "$cmd"
#----------------------------------------------------------#
# Cron #
#----------------------------------------------------------#
# Add cron job
cmd="v_add_cron_job $user 1 1 1 1 1 echo"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding cron job" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Adding cron job" "$?" "$tmpfile" "$cmd"
# Suspend cron job
cmd="v_suspend_cron_job $user 1"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Suspending cron job" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Suspending cron job" "$?" "$tmpfile" "$cmd"
# Unsuspend cron job
cmd="v_unsuspend_cron_job $user 1"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Unsuspending cron job" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Unsuspending cron job" "$?" "$tmpfile" "$cmd"
# Delete cron job
cmd="v_delete_cron_job $user 1"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Deleting cron job" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Deleting cron job" "$?" "$tmpfile" "$cmd"
# Add cron job
cmd="v_add_cron_job $user 1 1 1 1 1 echo 1"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding cron job" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Adding cron job" "$?" "$tmpfile" "$cmd"
# Add cron job
cmd="v_add_cron_job $user 1 1 1 1 1 echo 1"
@ -104,57 +111,200 @@ if [ "$?" -eq 4 ]; then
else
retval=1
fi
echo_result "Dublicate cron job check" "$retval" "$tmpfile" "$cmd"
echo_result "CRON: Dublicate cron job check" "$retval" "$tmpfile" "$cmd"
# Add second cron job
cmd="v_add_cron_job $user 2 2 2 2 2 echo 2"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding second cron job" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Adding second cron job" "$?" "$tmpfile" "$cmd"
# Rebuild cron jobs
cmd="v_rebuild_cron_jobs $user"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Rebuilding cron jobs" "$?" "$tmpfile" "$cmd"
echo_result "CRON: Rebuilding cron jobs" "$?" "$tmpfile" "$cmd"
#----------------------------------------------------------#
# IP #
#----------------------------------------------------------#
# List network interfaces
cmd="v_list_sys_interfaces plain"
interface=$($cmd 2> $tmpfile | head -n 1)
if [ -z "$interface" ]; then
echo_result "Listing network interfaces" "1" "$tmpfile" "$cmd"
echo_result "IP: Listing network interfaces" "1" "$tmpfile" "$cmd"
else
echo_result "Listing network interfaces" "0" "$tmpfile" "$cmd"
echo_result "IP: Listing network interfaces" "0" "$tmpfile" "$cmd"
fi
# Add ip address
cmd="v_add_sys_ip 198.18.0.123 255.255.255.255 $interface $user"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
echo_result "IP: Adding ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
# Add dublicate ip
$cmd > $tmpfile 2>> $tmpfile
if [ "$?" -eq 4 ]; then
retval=0
else
retval=1
fi
echo_result "IP: Dublicate ip address check" "$retval" "$tmpfile" "$cmd"
# Delete ip address
cmd="v_delete_sys_ip 198.18.0.123"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Deleting ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
echo_result "IP: Deleting ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
# Add ip address
cmd="v_add_sys_ip 198.18.0.125 255.255.255.255 $interface $user"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding ip 198.18.0.125" "$?" "$tmpfile" "$cmd"
echo_result "IP: Adding ip 198.18.0.125" "$?" "$tmpfile" "$cmd"
#----------------------------------------------------------#
# WEB #
#----------------------------------------------------------#
# Add web domain
domain="test-$(random 4).vestacp.com"
cmd="v_add_web_domain $user $domain 198.18.0.125"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding web domain $domain on 198.18.0.125" "$?" "$tmpfile" "$cmd"
echo_result "WEB: Adding domain $domain on 198.18.0.125" "$?" "$tmpfile" "$cmd"
# Add dublicate
$cmd > $tmpfile 2>> $tmpfile
if [ "$?" -eq 4 ]; then
retval=0
else
retval=1
fi
echo_result "WEB: Dublicate web domain check" "$retval" "$tmpfile" "$cmd"
# Add web domain alias
cmd="v_add_web_domain_alias $user $domain v3.$domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding alias v3.$domain" "$?" "$tmpfile" "$cmd"
echo_result "WEB: Adding alias v3.$domain" "$?" "$tmpfile" "$cmd"
# Alias dublicate
$cmd > $tmpfile 2>> $tmpfile
if [ "$?" -eq 4 ]; then
retval=0
else
retval=1
fi
echo_result "WEB: Dublicate web alias check" "$retval" "$tmpfile" "$cmd"
# Add web domain elog
cmd="v_add_web_domain_elog $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Enabling error logging support" "$?" "$tmpfile" "$cmd"
# Disabling cgi
cmd="v_delete_web_domain_cgi $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Disabling cgi support" "$?" "$tmpfile" "$cmd"
# Add web domain stats
cmd="v_add_web_domain_stats $user $domain webalizer"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Enabling webalizer" "$?" "$tmpfile" "$cmd"
# Add web domain stats
cmd="v_add_web_domain_stats_user $user $domain test m3g4p4ssw0rd"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Adding webalizer uzer" "$?" "$tmpfile" "$cmd"
# Add web domain nginx
cmd="v_add_web_domain_nginx $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Enabling nginx support" "$?" "$tmpfile" "$cmd"
# Suspend web domain
cmd="v_suspend_web_domain $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Suspending web domain" "$?" "$tmpfile" "$cmd"
# Unsuspend web domain
cmd="v_unsuspend_web_domain $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Unsuspending web domain" "$?" "$tmpfile" "$cmd"
# Add web domain ssl
cp $V_TEST/ssl/crt /tmp/$domain.crt
cp $V_TEST/ssl/key /tmp/$domain.key
cmd="v_add_web_domain_ssl $user $domain /tmp"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: Adding ssl support" "$?" "$tmpfile" "$cmd"
# Rebuild web domains
cmd="v_rebuild_web_domains $user"
$cmd > $tmpfile 2>> $tmpfile
echo_result "WEB: rebuilding web domains" "$?" "$tmpfile" "$cmd"
#----------------------------------------------------------#
# DNS #
#----------------------------------------------------------#
# Add dns domain
cmd="v_add_dns_domain $user $domain 198.18.0.125"
$cmd > $tmpfile 2>> $tmpfile
echo_result "Adding dns domain $domain" "$?" "$tmpfile" "$cmd"
echo_result "DNS: Adding dns domain $domain" "$?" "$tmpfile" "$cmd"
# Add dublicate
$cmd > $tmpfile 2>> $tmpfile
if [ "$?" -eq 4 ]; then
retval=0
else
retval=1
fi
echo_result "DNS: Dublicate domain check" "$retval" "$tmpfile" "$cmd"
# Add dns domain record
cmd="v_add_dns_domain_record $user $domain test A 198.18.0.125 20"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Adding dns domain record" "$?" "$tmpfile" "$cmd"
# Add dublicate
$cmd > $tmpfile 2>> $tmpfile
if [ "$?" -eq 4 ]; then
retval=0
else
retval=1
fi
echo_result "DNS: Dublicate record check" "$retval" "$tmpfile" "$cmd"
# Delete dns domain record
cmd="v_delete_dns_domain_record $user $domain 20"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Deleteing dns domain record" "$?" "$tmpfile" "$cmd"
# Change exp
cmd="v_change_dns_domain_exp $user $domain 2020-01-01"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Changing expiriation date" "$?" "$tmpfile" "$cmd"
# Change ip
cmd="v_change_dns_domain_ip $user $domain 127.0.0.1"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Changing domain ip" "$?" "$tmpfile" "$cmd"
# Suspend dns domain
cmd="v_suspend_dns_domain $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Suspending domain" "$?" "$tmpfile" "$cmd"
# Unuspend dns domain
cmd="v_unsuspend_dns_domain $user $domain"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Unsuspending domain" "$?" "$tmpfile" "$cmd"
# Rebuild dns domain
cmd="v_rebuild_dns_domains $user"
$cmd > $tmpfile 2>> $tmpfile
echo_result "DNS: Rebuilding domain" "$?" "$tmpfile" "$cmd"
# Add mail domain
cmd="v_add_mail_domain $user $domain"