webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

xt_geoip_update: Add support for upstream proxy.

Browse Source
This commit is contained in:
Stefan Schantl
2015-03-19 22:09:24 +01:00
parent 1ed8aedfdb
commit d9f47d9b9e
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scripts/xt_geoip_update
View File

@@ -32,14 +32,30 @@ CSV_FILE=GeoIPCountryWhois.csv
ARCH=LE ARCH=LE
eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
function download() { function download() {
echo "Downloading latest GeoIP ruleset..." echo "Downloading latest GeoIP ruleset..."
# Create temporary directory. # Create temporary directory.
mkdir -pv $TMP_PATH mkdir -pv $TMP_PATH
# Proxy settings.
# Check if a proxy should be used.
if [[ $UPSTREAM_PROXY ]]; then
PROXYSETTINGS="-e http_proxy=http://"
# Check if authentication against the proxy is configured.
if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then
PROXYSETTINGS="$PROXYSETTINGS$UPSTREAM_USER:$UPSTREAM_PASSWORD@"
fi
# Add proxy server.
PROXYSETTINGS="$PROXYSETTINGS$UPSTREAM_PROXY"
fi
# Get the latest GeoIP database from server. # Get the latest GeoIP database from server.
wget $DL_URL/$DL_FILE -O $TMP_FILE wget $DL_URL/$DL_FILE $PROXYSETTINGS -O $TMP_FILE
# Extract files. # Extract files.
unzip $TMP_FILE -d $TMP_PATH unzip $TMP_FILE -d $TMP_PATH