mirror of
https://github.com/myvesta/vesta
synced 2025-08-19 04:50:47 -07:00
Fixes for proper EIP handling
This commit is contained in:
Serghey Rodin
parent
4363244c1a
commit
f68bb795de
3 changed files with 130 additions and 113 deletions
|
|
@ -34,48 +34,72 @@ is_ip_valid "$ip"
|
|||
# Action #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
# Changing nat ip
|
||||
# Updating IP
|
||||
if [ -z "$(grep NAT= $VESTA/data/ips/$ip)" ]; then
|
||||
sed -i "s/^TIME/NAT='$nat_ip'\nTIME/g" $VESTA/data/ips/$ip
|
||||
old=''
|
||||
new=$nat_ip
|
||||
else
|
||||
update_ip_value '$NAT' "$nat_ip"
|
||||
old=$(get_ip_value '$NAT')
|
||||
new=$nat_ip
|
||||
sed -i "s/NAT=.*/NAT='$new'/" $VESTA/data/ips/$ip
|
||||
if [ -z "$nat_ip" ]; then
|
||||
new=$ip
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check ftp system
|
||||
# Updating WEB configs
|
||||
if [ ! -z "$old" ] && [ ! -z "$WEB_SYSTEM" ]; then
|
||||
sed -i "s/$old/$new/" $VESTA/data/users/*/web.conf
|
||||
for user in $(ls $VESTA/data/users/); do
|
||||
$BIN/v-rebuild-web-domains $user no
|
||||
done
|
||||
$BIN/v-restart-dns $restart
|
||||
fi
|
||||
|
||||
# Updating DNS configs
|
||||
if [ ! -z "$old" ] && [ ! -z "$DNS_SYSTEM" ]; then
|
||||
sed -i "s/$old/$new/" $VESTA/data/users/*/dns.conf
|
||||
sed -i "s/$old/$new/" $VESTA/data/users/*/dns/*.conf
|
||||
for user in $(ls $VESTA/data/users/); do
|
||||
$BIN/v-rebuild-dns-domains $user no
|
||||
done
|
||||
$BIN/v-restart-dns $restart
|
||||
fi
|
||||
|
||||
# Updating FTP
|
||||
if [ ! -z "$old" ] && [ ! -z "$FTP_SYSTEM" ]; then
|
||||
conf=$(find /etc -name $FTP_SYSTEM.conf)
|
||||
if [ -e "$conf" ]; then
|
||||
sed -i "s/$old/$new/g" $conf
|
||||
if [ "$FTP_SYSTEM" = 'vsftpd' ]; then
|
||||
|
||||
# Find configuration
|
||||
if [ -e '/etc/vsftpd/vsftpd.conf' ]; then
|
||||
conf='/etc/vsftpd/vsftpd.conf'
|
||||
fi
|
||||
|
||||
if [ -e '/etc/vsftpd.conf' ]; then
|
||||
conf='/etc/vsftpd.conf'
|
||||
fi
|
||||
|
||||
# Update config
|
||||
if [ -z "$(grep pasv_address $conf)" ]; then
|
||||
if [ ! -z "$nat_ip" ]; then
|
||||
check_pasv=$(grep pasv_address $conf)
|
||||
if [ -z "$check_pasv" ] && [ ! -z "$nat_ip" ]; then
|
||||
echo "pasv_address=$nat_ip" >> $conf
|
||||
fi
|
||||
else
|
||||
if [ ! -z "$nat_ip" ]; then
|
||||
sed -i "s/pasv_address=.*/pasv_address='$nat_ip'/g" $conf
|
||||
else
|
||||
if [ ! -z "$check_pasv" ] && [ -z "$nat_ip" ]; then
|
||||
sed -i "/pasv_address/d" $conf
|
||||
fi
|
||||
if [ ! -z "$check_pasv" ] && [ ! -z "$nat_ip" ]; then
|
||||
sed -i "s/pasv_address=.*/pasv_address='$nat_ip'/g" $conf
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
$BIN/v-restart-ftp $restart
|
||||
fi
|
||||
|
||||
# Updating firewall
|
||||
if [ ! -z "$old" ] && [ ! -z "$FIREWALL_SYSTEM" ]; then
|
||||
sed -i "s/$old/$new/g" $VESTA/data/firewall/*.conf
|
||||
$BIN/v-update-firewall
|
||||
fi
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
# Vesta #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
# Restart ftp server
|
||||
$BIN/v-restart-ftp $restart
|
||||
check_result $? "FTP restart failed" >/dev/null
|
||||
|
||||
# Logging
|
||||
log_history "changed associated nat address on $ip to $nat_ip" '' 'admin'
|
||||
log_event "$OK" "$ARGUMENTS"
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ is_ip_valid "$ip" "$user"
|
|||
# Preparing variables for vhost replace
|
||||
get_domain_values 'web'
|
||||
old=$(get_real_ip $IP)
|
||||
new=$ip
|
||||
new=$(get_real_ip $ip)
|
||||
|
||||
# Replacing vhost
|
||||
replace_web_config "$WEB_SYSTEM" "$TPL.tpl"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
# info: update system ip
|
||||
# options: [USER] [IP_STATUS]
|
||||
# options: [NONE]
|
||||
#
|
||||
# The function scans configured ip in the system and register them with vesta
|
||||
# internal database. This call is intended for use on vps servers, where ip is
|
||||
|
|
@ -11,14 +11,11 @@
|
|||
# Variable&Function #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
# Argument definition
|
||||
user=${1-admin}
|
||||
ip_status=${2-shared}
|
||||
# Importing system variables
|
||||
source /etc/profile
|
||||
|
||||
# Includes
|
||||
source /etc/profile.d/vesta.sh
|
||||
source $VESTA/func/main.sh
|
||||
source $VESTA/func/ip.sh
|
||||
source $VESTA/conf/vesta.conf
|
||||
|
||||
|
||||
|
|
@ -26,84 +23,81 @@ source $VESTA/conf/vesta.conf
|
|||
# Verifications #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
check_args '0' "$#" '[USER] [IP_STATUS]'
|
||||
is_format_valid 'user' 'ip_status'
|
||||
is_object_valid 'user' 'USER' "$user" "$user"
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
# Action #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
# Get list of ip addresses
|
||||
ip_list=$(/sbin/ip addr|grep 'inet '|grep global|awk '{print $2}')
|
||||
ip_list=$(echo "$ip_list"|cut -f 1 -d /)
|
||||
ip_num=$(echo "$ip_list" | wc -l)
|
||||
# Listing system ip addresses
|
||||
ips=$(/sbin/ip addr |grep 'inet ' |grep global |awk '{print $2}' |cut -f1 -d/)
|
||||
v_ips=$(ls $VESTA/data/ips/)
|
||||
ip_num=$(echo "$ips" |wc -l)
|
||||
v_ip_num=$(echo "$v_ips" |wc -l)
|
||||
|
||||
# WorkAround for DHCP IP address
|
||||
vst_ip_list=$(ls $VESTA/data/ips/)
|
||||
vst_ip_num=$(echo "$vst_ip_list" | wc -l)
|
||||
|
||||
if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
|
||||
if [ $ip_num -eq 1 ] && [ "$ip_list" != "$vst_ip_list" ]; then
|
||||
new=$ip_list
|
||||
old=$vst_ip_list
|
||||
mv $VESTA/data/ips/$old $VESTA/data/ips/$new
|
||||
if [ ! -z "$PROXY_SYSTEM" ]; then
|
||||
mv /etc/$PROXY_SYSTEM/conf.d/$old.conf \
|
||||
/etc/$PROXY_SYSTEM/conf.d/$new.conf
|
||||
sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf
|
||||
# Checking primary IP change
|
||||
if [[ "$ip_num" -eq '1' ]] && [[ "$v_ip_num" -eq 1 ]]; then
|
||||
if [ "$ips" != "$v_ips" ]; then
|
||||
new=$ips
|
||||
old=$v_ips
|
||||
fi
|
||||
fi
|
||||
if [ ! -z "$WEB_SYSTEM" ]; then
|
||||
mv /etc/$WEB_SYSTEM/conf.d/$old.conf \
|
||||
/etc/$WEB_SYSTEM/conf.d/$new.conf
|
||||
sed -i "s/$old/$new/g" /etc/$WEB_SYSTEM/conf.d/$new.conf
|
||||
sed -i "s/$old/$new/g" $VESTA/data/users/*/web.conf
|
||||
|
||||
# Rebuild web domains
|
||||
# Updating configs
|
||||
if [ ! -z "$new" ]; then
|
||||
mv $VESTA/data/ips/$old $VESTA/data/ips/$new
|
||||
|
||||
# Updating PROXY
|
||||
if [ ! -z "$PROXY_SYSTEM" ]; then
|
||||
cd /etc/$PROXY_SYSTEM/conf.d
|
||||
if [ -e "$old.conf" ]; then
|
||||
mv $old.conf $new.conf
|
||||
sed -i "s/$old/$new/g" $new.conf
|
||||
$BIN/v-restart-proxy
|
||||
fi
|
||||
fi
|
||||
|
||||
# Updating WEB
|
||||
if [ ! -z "$WEB_SYSTEM" ]; then
|
||||
cd /etc/$WEB_SYSTEM/conf.d
|
||||
if [ -e "$old.conf" ]; then
|
||||
mv $old.conf $new.conf
|
||||
sed -i "s/$old/$new/g" $new.conf
|
||||
fi
|
||||
sed -i "s/$old/$new/g" $VESTA/data/users/*/web.conf
|
||||
for user in $(ls $VESTA/data/users/); do
|
||||
$BIN/v-rebuild-web-domains $user no
|
||||
done
|
||||
fi
|
||||
if [ ! -z "$FTP_SYSTEM" ];then
|
||||
ftpd_conf_file=$(find /etc/ -maxdepth 2 -name $FTP_SYSTEM.conf)
|
||||
sed -i "s/$old/$new/g" $ftpd_conf_file
|
||||
fi
|
||||
|
||||
# Restarting web server
|
||||
$BIN/v-restart-web
|
||||
|
||||
# Restarting ftp server
|
||||
$BIN/v-restart-ftp
|
||||
|
||||
# Restarting proxy server
|
||||
if [ ! -z "$PROXY_SYSTEM" ]; then
|
||||
$BIN/v-restart-proxy
|
||||
fi
|
||||
|
||||
# Restarting firewall
|
||||
if [ ! -z "$FIREWALL_SYSTEM" ]; then
|
||||
$BIN/v-update-firewall
|
||||
fi
|
||||
|
||||
# Updating DNS
|
||||
if [ ! -z "$DNS_SYSTEM" ]; then
|
||||
# Rebuild dns domains
|
||||
sed -i "s/$old/$new/g" $VESTA/data/users/*/dns.conf
|
||||
sed -i "s/$old/$new/g" $VESTA/data/users/*/dns/*.conf
|
||||
for user in $(ls $VESTA/data/users/); do
|
||||
sed -i "s/$old/$new/g" $VESTA/data/users/$user/dns.conf
|
||||
sed -i "s/$old/$new/g" $VESTA/data/users/$user/dns/*.conf
|
||||
$BIN/v-rebuild-dns-domains $user no
|
||||
done
|
||||
$BIN/v-restart-dns
|
||||
check_result $? "dns restart failed" >/dev/null
|
||||
fi
|
||||
|
||||
# No further comparation is needed
|
||||
exit
|
||||
# Updating FTP
|
||||
if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" = 'vsftpd' ]; then
|
||||
conf=$(find /etc/ -maxdepth 2 -name $FTP_SYSTEM.conf)
|
||||
if [ ! -z "$conf" ]; then
|
||||
sed -i "s/$old/$new/g" $conf
|
||||
$BIN/v-restart-ftp
|
||||
fi
|
||||
fi
|
||||
|
||||
# Compare ips
|
||||
for ip in $ip_list; do
|
||||
# Updating firewall
|
||||
if [ ! -z "$FIREWALL_SYSTEM" ]; then
|
||||
sed -i "s/$old/$new/g" $VESTA/data/firewall/*.conf
|
||||
$BIN/v-update-firewall
|
||||
fi
|
||||
fi
|
||||
|
||||
# Adding system IP
|
||||
for ip in $ips; do
|
||||
check_ifconfig=$(/sbin/ifconfig |grep "$ip")
|
||||
if [ ! -e "$VESTA/data/ips/$ip" ] && [ ! -z "$check_ifconfig" ]; then
|
||||
interface=$(/sbin/ip addr |grep $ip |awk '{print $NF}' |uniq)
|
||||
|
|
@ -114,11 +108,10 @@ for ip in $ip_list; do
|
|||
fi
|
||||
done
|
||||
|
||||
# Checking NAT
|
||||
# Updating NAT
|
||||
pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
|
||||
if [ ! -z "$pub_ip" ] && [ ! -e "$VESTA/data/ips/$pub_ip" ]; then
|
||||
check_nat=$(grep -R "$pub_ip" $VESTA/data/ips/)
|
||||
if [ -z "$check_nat" ]; then
|
||||
if [ ! -e "$VESTA/data/ips/$pub_ip" ]; then
|
||||
if [ -z "$(grep -R "$pub_ip" $VESTA/data/ips/)" ]; then
|
||||
ip=$(ls -t $VESTA/data/ips/ |head -n1)
|
||||
$BIN/v-change-sys-ip-nat $ip $pub_ip
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue