github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 10:37:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added ip tab triggers. Issue #50

Browse source
This commit is contained in:
Serghey Rodin 2012-02-21 10:29:15 +02:00
commit 758b5e7a3e
6 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bin/v_add_sys_ip
View file

@ -90,8 +90,20 @@ namehost_ip_support
# Vesta #
#----------------------------------------------------------#
# Updating user conf
# Updating user counters
increase_user_value "$user" '$IP_OWNED'
if [ "$user" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for user in $(ls $V_USERS/); do
increase_user_value "$user" '$IP_AVAIL'
done
else
increase_user_value 'admin' '$IP_AVAIL'
fi
else
increase_user_value "$user" '$IP_AVAIL'
increase_user_value 'admin' '$IP_AVAIL'
fi
# Adding task to the vesta pipe
if [ "$web_restart" = 'yes' ]; then

26
bin/v_change_sys_ip_owner
View file

@ -53,9 +53,35 @@ is_ip_key_empty '$U_SYS_USERS'
# Changing ip owner
ip_owner=$(get_sys_ip_value '$OWNER')
if [ "$ip_owner" != "$user" ]; then
ip_status="$(get_sys_ip_value '$STATUS')"
update_sys_ip_value '$OWNER' "$user"
decrease_user_value "$ip_owner" '$IP_OWNED'
if [ "$ip_owner" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for vesta_user in $(ls $V_USERS/); do
decrease_user_value "$vesta_user" '$IP_AVAIL'
done
else
decrease_user_value 'admin' '$IP_AVAIL'
fi
else
decrease_user_value "$ip_owner" '$IP_AVAIL'
decrease_user_value 'admin' '$IP_AVAIL'
fi
increase_user_value "$user" '$IP_OWNED'
if [ "$user" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for user in $(ls $V_USERS/); do
increase_user_value "$user" '$IP_AVAIL'
done
else
increase_user_value 'admin' '$IP_AVAIL'
fi
else
increase_user_value "$user" '$IP_AVAIL'
increase_user_value 'admin' '$IP_AVAIL'
fi
fi

15
bin/v_delete_sys_ip
View file

@ -56,6 +56,7 @@ rconf='/etc/httpd/conf.d/rpaf.conf'
# Get ip owner
user="$(get_sys_ip_value '$OWNER')"
ip_status="$(get_sys_ip_value '$STATUS')"
# Deleting interface
/sbin/ifconfig "$interface" down
@ -82,6 +83,20 @@ if [ ! -z "$user" ]; then
decrease_user_value "$user" '$IP_OWNED'
fi
if [ "$user" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for user in $(ls $V_USERS/); do
decrease_user_value "$user" '$IP_AVAIL'
done
else
decrease_user_value 'admin' '$IP_AVAIL'
fi
else
decrease_user_value "$user" '$IP_AVAIL'
decrease_user_value 'admin' '$IP_AVAIL'
fi
# Adding task to the vesta pipe
if [ "$web_restart" = 'yes' ]; then
restart_schedule 'web'

3
bin/v_delete_user_ips
View file

@ -57,7 +57,8 @@ for ip in $ip_list; do
# Assig ip to main account
update_sys_ip_value '$OWNER' 'admin'
update_sys_ip_value '$STATUS' 'exclusive'
increase_user_value 'admin' '$IP_OWNED'
increase_user_value 'admin' '$IP_AVAIL'
done

1
bin/v_list_user_ips
View file

@ -25,7 +25,6 @@ json_list_user_ips() {
for IP in $(ls $V_IPS/); do
source $V_IPS/$IP
if [ "$OWNER" = "$user" ]; then
eval echo "$fields"
# Closing bracket if there already was output
if [ -n "$data" ]; then
echo -e ' },'

4
bin/v_update_user_counters
View file

@ -93,15 +93,15 @@ for user in $user_list; do
source $V_IPS/$ip
if [ "$OWNER" = "$user" ]; then
IP_OWNED=$((IP_OWNED + 1))
IP_AVAIL=$((IP_AVAIL + 1))
fi
if [ "$OWNER" = 'admin' ] && [ "$STATUS" = 'shared' ]; then
IP_AVAIL=$((IP_AVAIL + IP_OWNED))
IP_AVAIL=$((IP_AVAIL + 1))
fi
done
if [ "$user" = 'admin' ]; then
IP_AVAIL=$(ls $V_IPS | wc -l)
fi
fi
# Checking web system
U_WEB_DOMAINS=0