From eacdbc4d6a41690fc6e703f767eee573c7e046c6 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 11 Nov 2014 11:33:53 -0200 Subject: [PATCH] Revert "Ticket #3789. Put a start at using the proxyurl/proxyport from system configured settings for bogons. It still does not consider the user/pass configured" This reverts commit 664adf3845cf1df89769bb0ed5fc113048e0912e. --- etc/rc.update_bogons.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/etc/rc.update_bogons.sh b/etc/rc.update_bogons.sh index 178d60e01..d0aac9b0a 100755 --- a/etc/rc.update_bogons.sh +++ b/etc/rc.update_bogons.sh @@ -84,14 +84,6 @@ if [ "$proc_error" != "" ]; then exit fi -HTTP_PROXY=`/usr/local/bin/xmllint --xpath 'string(//pfsense/system/proxyurl)' /conf/config.xml` -if [ "${HTTP_PROXY}" != "" ]; then - HTTP_PROXY_PORT=`/usr/local/bin/xmllint --xpath 'string(//pfsense/system/proxyport)' /conf/config.xml` - if [ "${HTTP_PROXY_PORT}" != "" ]; then - HTTP_PROXY="${HTTP_PROXY}:${HTTP_PROXY_PORT}" - fi - export HTTP_PROXY -fi BOGON_V4_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v4urlcksum}" | awk '{ print $4 }'` ON_DISK_V4_CKSUM=`md5 /tmp/bogons | awk '{ print $4 }'` BOGON_V6_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v6urlcksum}" | awk '{ print $4 }'`