From 2bb8166f7be90d0bfe5e91c6ad1db7e1c4b3aa87 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 18 Nov 2012 18:09:33 +0200
Subject: [PATCH] switching from mod_rpaf to mod_extract_forwarded.conf

---
 bin/v-add-sys-ip    | 2 +-
 bin/v-delete-sys-ip | 2 +-
 bin/v-update-sys-ip | 2 +-
 func/domain.sh      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip
index f4ade078d..17662b17a 100755
--- a/bin/v-add-sys-ip
+++ b/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"
diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
index 3089a918d..92c0a39b7 100755
--- a/bin/v-delete-sys-ip
+++ b/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')"
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index 446fcaeb4..2aef51c6a 100755
--- a/bin/v-update-sys-ip
+++ b/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
diff --git a/func/domain.sh b/func/domain.sh
index bf15a3fe3..057c29ae4 100755
--- a/func/domain.sh
+++ b/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'