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

Fixed bug on ip removal

Browse source
This commit is contained in:
Serghey Rodin 2013-02-20 15:00:12 +02:00
commit d21cea188e
2 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bin/v-delete-sys-ip
View file

@ -46,11 +46,17 @@ user="$(get_ip_value '$OWNER')"
ip_status="$(get_ip_value '$STATUS')" ip_status="$(get_ip_value '$STATUS')"
# Deleting interface # Deleting interface
get_current_interface interface=$(/sbin/ifconfig |grep -B1 "addr:$ip "|head -n 1 |cut -f 1 -d ' ')
/sbin/ifconfig "$interface" down if [ ! -z "$interface" ] && [ -z "$(echo $interface|cut -s -f2 -d :)" ]; then
echo "Error: Main IP on interface"
# Deleting startup script log_event "$E_FORBIDEN" "$EVENT"
rm -f $iconf-$interface exit $E_FORBIDEN
fi
if [ ! -z "$interface" ]; then
/sbin/ifconfig "$interface" down
iconf='/etc/sysconfig/network-scripts/ifcfg'
rm -f $iconf-$interface
fi
# Deleting vesta ip # Deleting vesta ip
rm -f $VESTA/data/ips/$ip rm -f $VESTA/data/ips/$ip

16
func/ip.sh
View file

@ -172,22 +172,6 @@ get_ip_value() {
echo "$value" echo "$value"
} }
# Get current ip interface
get_current_interface() {
i=$(/sbin/ifconfig |grep -B1 "addr:$ip "|head -n 1 |cut -f 1 -d ' ')
if [ -z "$i" ]; then
echo "Error: interface for ip $ip not found"
log_event "$E_NOTEXIST" "$EVENT"
exit $E_NOTEXIST
fi
if [ -z "$(echo $i | cut -s -f 2 -d :)" ]; then
echo "Error: Main IP on interface"
log_event "$E_FORBIDEN" "$EVENT"
exit $E_FORBIDEN
fi
interface="$i"
}
# Create ip vesta configuration # Create ip vesta configuration
create_vesta_ip() { create_vesta_ip() {
ip_data="OWNER='$user'" ip_data="OWNER='$user'"