github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 21:04:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

get user ip fix

Browse source
This commit is contained in:
Serghey Rodin 2016-06-25 11:08:19 +03:00
commit d30f9d1000
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-add-domain
View file

@ -39,7 +39,7 @@ is_object_unsuspended 'user' 'USER' "$user"
# Get ip if it wasn't defined # Get ip if it wasn't defined
if [ -z "$ip" ]; then if [ -z "$ip" ]; then
get_user_ip $user get_user_ip
if [ -z "$ip" ]; then if [ -z "$ip" ]; then
check_result $E_NOTEXIST "no avaiable IP address" check_result $E_NOTEXIST "no avaiable IP address"
fi fi

4
func/ip.sh
View file

@ -197,12 +197,12 @@ get_broadcast() {
get_user_ips() { get_user_ips() {
dedicated=$(grep -H "OWNER='$user'" $VESTA/data/ips/*) dedicated=$(grep -H "OWNER='$user'" $VESTA/data/ips/*)
dedicated=$(echo "$dedicated" |cut -f 1 -d : |sed 's=.*/==') dedicated=$(echo "$dedicated" |cut -f 1 -d : |sed 's=.*/==')
shared=$(grep -H -A1 "OWNER='$owner'" $VESTA/data/ips/* |grep shared) shared=$(grep -H -A1 "OWNER='admin'" $VESTA/data/ips/* |grep shared)
shared=$(echo "$shared" |cut -f 1 -d : |sed 's=.*/==' |cut -f 1 -d \-) shared=$(echo "$shared" |cut -f 1 -d : |sed 's=.*/==' |cut -f 1 -d \-)
for dedicated_ip in $dedicated; do for dedicated_ip in $dedicated; do
shared=$(echo "$shared" |grep -v $dedicated_ip) shared=$(echo "$shared" |grep -v $dedicated_ip)
done done
echo -e "$dedicated\n$shared" echo -e "$dedicated\n$shared" |sed "/^$/d"
} }
# Get user ip # Get user ip