switching from mod_rpaf to mod_extract_forwarded.conf

bin/v-add-sys-ip

@@ -54,7 +54,7 @@ get_ip_iface
 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/rpaf.conf'
+rconf='/etc/httpd/conf.d/mod_extract_forwarded.conf'
 
 # Adding ip
 /sbin/ifconfig "$iface" "$ip" netmask "$mask"

bin/v-delete-sys-ip

@@ -39,7 +39,7 @@ is_ip_key_empty '$U_SYS_USERS'
 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/rpaf.conf'
+rconf='/etc/httpd/conf.d/mod_extract_forwarded.conf'
 
 # Get ip owner
 user="$(get_ip_value '$OWNER')"

bin/v-update-sys-ip

@@ -46,7 +46,7 @@ vesta_ip_list=$(ls $VESTA/data/ips/)
 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/rpaf.conf'
+rconf='/etc/httpd/conf.d/mod_extract_forwarded.conf'
 
 # Comparing each ip
 for ip in $ip_list; do

func/domain.sh

@@ -325,7 +325,7 @@ namehost_ip_support() {
              -e "s/%web_port%/$WEB_PORT/g" \
             -e "s/%proxy_port%/$PROXY_PORT/g" >>$nconf
 
-            ips=$(grep 'RPAFproxy_ips' $rconf)
+            ips=$(grep 'MEFaccept ' $rconf |grep -v '#'| head -n1)
             sed -i "s/$ips/$ips $ip/g" $rconf
         fi
         web_restart='yes'