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

new improved template scheme

Browse source
This commit is contained in:
Serghey Rodin 2013-05-10 11:04:40 +03:00
commit fd4e68bb8c
96 changed files with 1395 additions and 1425 deletions
Download patch file Download diff file Expand all files Collapse all files

46
bin/v-update-sys-ip
View file

@ -16,10 +16,8 @@ user=${1-admin}
ip_status=${2-shared}
# Includes
source $VESTA/conf/vesta.conf # include for internal func
source $VESTA/conf/vesta.conf
source $VESTA/func/main.sh
source $VESTA/func/ip.sh
source $VESTA/func/domain.sh
#----------------------------------------------------------#
@ -35,40 +33,15 @@ is_object_valid 'user' 'USER' "$user" "$user"
# Action #
#----------------------------------------------------------#
# Get ip list
ip_list=$(/sbin/ifconfig | grep 'inet addr:' | cut -f 2 -d : | \
cut -f 1 -d ' '| grep -v 127.0.0.1)
# Get vesta registered ip list
vesta_ip_list=$(ls $VESTA/data/ips/)
# Defining config paths
conf='/etc/httpd/conf.d/vesta.conf'
nconf='/etc/nginx/conf.d/vesta_ip.conf'
iconf='/etc/sysconfig/network-scripts/ifcfg'
rconf='/etc/httpd/conf.d/mod_extract_forwarded.conf'
# Comparing each ip
for ip in $ip_list; do
check_ip=$(echo $vesta_ip_list | grep -w "$ip")
# Checking ip registered
if [ -z "$check_ip" ]; then
# Parsing additional params
iface=$(/sbin/ifconfig |grep -B1 -w $ip |head -n 1 |cut -f 1 -d ' ')
if [ ! -e "$VESTA/data/ips/$ip" ]; then
iface=$(/sbin/ifconfig |grep -B1 -w $ip |head -n1 |cut -f1 -d ' ')
interface=$(echo "$iface" | cut -f 1 -d :)
mask=$(/sbin/ifconfig |grep -w $ip |awk -F "Mask:" '{print $2}')
# Adding vesta ip
create_vesta_ip
# Adding namehosting support
namehost_ip_support
# Creating startup script
if [ ! -e "$iconf-$iface" ]; then
create_vesta_ip
fi
$BIN/v-add-sys-ip $ip $mask $interface
fi
# TBD: revers comparation
@ -79,15 +52,4 @@ done
# Vesta #
#----------------------------------------------------------#
# Updating user conf
increase_user_value "$user" '$IP_OWNED'
# Restart web server
if [ "$web_restart" = 'yes' ]; then
$BIN/v-restart-web "$EVENT"
fi
# Logging
log_event "$OK" "$EVENT"
exit