github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 10:37:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes in add/delete ip functions

Browse source
This commit is contained in:
Serghey Rodin 2011-12-22 11:27:23 +02:00
commit dffb7c3547
6 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
func/domain.func
View file

@ -600,33 +600,29 @@ dom_clear_list() {
}
namehost_ip_support() {
#Checking web system
# Checking httpd config for NameHost string number
if [ "$WEB_SYSTEM" = 'apache' ]; then
# Checking httpd config for NameHost string number
conf_line=$(grep -n "NameVirtual" $conf|tail -n 1|cut -f 1 -d ':')
if [ ! -z "$conf_line" ]; then
conf_ins=$((conf_line + 1)) # inster into next line
conf_ins=$((conf_line + 1))
else
conf_ins='1' # insert into first line
conf_ins='1'
fi
# Checking ssl support
if [ "$WEB_SSL" = 'mod_ssl' ]; then
web_ssl_port=$(get_config_value '$WEB_SSL_PORT')
sed -i "$conf_ins i NameVirtualHost $ip:$web_ssl_port" $conf
sed -i "$conf_ins i Listen $ip:$web_ssl_port" $conf
sed -i "$conf_ins i NameVirtualHost $ip:$WEB_SSL_PORT" $conf
sed -i "$conf_ins i Listen $ip:$WEB_SSL_PORT" $conf
fi
web_port=$(get_config_value '$WEB_PORT')
sed -i "$conf_ins i NameVirtualHost $ip:$web_port" $conf
sed -i "$conf_ins i Listen $ip:$web_port" $conf
sed -i "$conf_ins i NameVirtualHost $ip:$WEB_PORT" $conf
sed -i "$conf_ins i Listen $ip:$WEB_PORT" $conf
# Checking proxy support
if [ "$PROXY_SYSTEM" = 'nginx' ]; then
proxy_port=$(get_config_value '$PROXY_PORT')
cat $V_WEBTPL/ngingx_ip.tpl | sed -e "s/%ip%/$ip/g" \
-e "s/%web_port%/$web_port/g" -e "s/%proxy_port%/$proxy_port/g" >>$nconf
-e "s/%web_port%/$WEB_SSL_PORT/g" \
-e "s/%proxy_port%/$PROXY_PORT/g" >>$nconf
# Adding to rpaf ip pool as well
ips=$(grep 'RPAFproxy_ips' $rconf)

4
func/ip.func
View file

@ -1,6 +1,6 @@
is_sys_ip_free() {
# Parsing system ips
ip_list=$(ifconfig|grep 'inet addr:'|cut -f 2 -d ':'|cut -f 1 -d " ")
ip_list=$(/sbin/ifconfig|grep 'inet addr:'|cut -f 2 -d ':'|cut -f 1 -d " ")
# Checking ip existance
ip_check=$(echo "$ip_list"|grep -w "$ip")
@ -13,7 +13,7 @@ is_sys_ip_free() {
get_next_interface_number() {
# Parsing ifconfig
i=$(ifconfig -a |grep -w "$interface"|cut -f1 -d ' '|\
i=$(/sbin/ifconfig -a |grep -w "$interface"|cut -f1 -d ' '|\
tail -n 1|cut -f 2 -d :)
# Checking result