Skip to content

Commit 4a34f94

Browse files
committed
Workaround for stopped Amazon instance
1 parent e7c9435 commit 4a34f94

File tree

1 file changed

+47
-2
lines changed

1 file changed

+47
-2
lines changed

bin/v-update-sys-ip

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,66 @@ is_object_valid 'user' 'USER' "$user" "$user"
3333
# Action #
3434
#----------------------------------------------------------#
3535

36+
# Get list of ip addresses
3637
ip_list=$(/sbin/ifconfig | grep 'inet addr:' | cut -f 2 -d : | \
3738
cut -f 1 -d ' '| grep -v 127.0.0.1)
39+
ip_num=$(echo "$ip_list" | wc -l)
3840

41+
# WorkAround for Amazon stop/start issue
42+
vst_ip_list=$(ls $VESTA/data/ips/)
43+
vst_ip_num=$(echo "$vst_ip_list" | wc -l)
44+
45+
if [ "$ip_num" -eq '1' ] && [ "$vst_ip_num" -eq '1' ]; then
46+
if [ "$ip_list" != "$vst_ip_list" ]; then
47+
new=$ip_list
48+
old=$vst_ip_list
49+
mv $VESTA/data/ips/$old $VESTA/data/ips/$new
50+
if [ ! -z "$PROXY_SYSTEM" ]; then
51+
mv /etc/$PROXY_SYSTEM/conf.d/$old.conf \
52+
/etc/$PROXY_SYSTEM/conf.d/$new.conf
53+
sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf
54+
$BIN/v-restart-proxy
55+
fi
56+
if [ ! -z "$WEB_SYSTEM" ]; then
57+
mv /etc/$WEB_SYSTEM/conf.d/$old.conf \
58+
/etc/$WEB_SYSTEM/conf.d/$new.conf
59+
sed -i "s/$old/$new/g" /etc/$WEB_SYSTEM/conf.d/$new.conf
60+
sed -i "s/$old/$new/g" $VESTA/data/users/*/web.conf
61+
62+
# Rebuild web domains
63+
for user in $(ls $VESTA/data/users/); do
64+
$BIN/v-rebuild-web-domains $user no
65+
done
66+
$BIN/v-restart-web
67+
fi
68+
69+
if [ ! -z "$DNS_SYSTEM" ]; then
70+
# Rebuild dns domains
71+
for user in $(ls $VESTA/data/users/); do
72+
sed -i "s/$old/$new/g" $VESTA/data/users/$user/dns.conf
73+
sed -i "s/$old/$new/g" $VESTA/data/users/$user/dns/*.conf
74+
$BIN/v-rebuild-dns-domains $user no
75+
done
76+
$BIN/v-restart-dns
77+
fi
78+
79+
# No further comparation is needed
80+
exit
81+
fi
82+
fi
83+
84+
# Compare ips
3985
for ip in $ip_list; do
4086
if [ ! -e "$VESTA/data/ips/$ip" ]; then
4187
iface=$(/sbin/ifconfig |grep -B1 -w $ip |head -n1 |cut -f1 -d ' ')
4288
interface=$(echo "$iface" | cut -f 1 -d :)
4389
mask=$(/sbin/ifconfig |grep -w $ip |awk -F "Mask:" '{print $2}')
4490
$BIN/v-add-sys-ip $ip $mask $interface
4591
fi
46-
47-
# TBD: revers comparation
4892
done
4993

5094

95+
5196
#----------------------------------------------------------#
5297
# Vesta #
5398
#----------------------------------------------------------#

0 commit comments

Comments
 (0)