diff options
| author | BBcan177 <bbcan177@gmail.com> | 2015-02-03 14:20:48 -0500 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-02-03 19:42:44 -0200 |
| commit | a65a77ecf95a2f7c1092755c9978b38f3a361d89 (patch) | |
| tree | f5affd311c7040359fb8e5182ccac0ede6156aa6 /config/pfblockerng/geoipupdate.sh | |
| parent | c7e9ae35de710b7fb142542fa116cf707a0f768c (diff) | |
| download | pfsense-packages-a65a77ecf95a2f7c1092755c9978b38f3a361d89.tar.gz pfsense-packages-a65a77ecf95a2f7c1092755c9978b38f3a361d89.tar.bz2 pfsense-packages-a65a77ecf95a2f7c1092755c9978b38f3a361d89.zip | |
pfBlockerNG - Fix Cron Update process and other improvements
Changes:
1) Add missing $pfbfolder variable to Cron Update function
2) Modify how the include files get loaded.
3) Reputation Tab only requires IPv4, simplify code to use IPv4 only for
this function.
4) Update geoipupdate.sh to use the New PBI folder location and remove
Archive folders after MaxMind Update process
Diffstat (limited to 'config/pfblockerng/geoipupdate.sh')
| -rw-r--r-- | config/pfblockerng/geoipupdate.sh | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/config/pfblockerng/geoipupdate.sh b/config/pfblockerng/geoipupdate.sh index 4b8fbb63..302f81f5 100644 --- a/config/pfblockerng/geoipupdate.sh +++ b/config/pfblockerng/geoipupdate.sh @@ -23,19 +23,23 @@ # may be met by including the following in all advertising and documentation # mentioning features of or use of this database. -# Folder Locations +mtype=$(/usr/bin/uname -m); + +# Application Locations pathfetch=/usr/bin/fetch pathtar=/usr/bin/tar pathgunzip=/usr/bin/gunzip -# File Locations +# Folder Locations pathdb=/var/db/pfblockerng +pathpbi=/usr/pbi/pfblockerng-$mtype/share/GeoIP pathlog=/var/log/pfblockerng + +# File Locations errorlog=$pathlog/geoip.log -pathgeoipdatgz=$pathdb/GeoIP.dat.gz -pathgeoipdatgzv6=$pathdb/GeoIPv6.dat.gz -pathgeoipdat=$pathdb/GeoIP.dat -pathgeoipdatv6=$pathdb/GeoIPv6.dat +geoipdat=/GeoIP.dat +geoipdatv6=/GeoIPv6.dat + pathgeoipcc=$pathdb/country_continent.csv pathgeoipcsv4=$pathdb/GeoIPCountryCSV.zip pathgeoipcsvfinal4=$pathdb/GeoIPCountryWhois.csv @@ -56,12 +60,12 @@ binaryupdate() { echo " ** Downloading MaxMind GeoLite IPv4 Binary Database (For Reputation/Alerts Processes) **"; echo URL="http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz" -$pathfetch -v -o $pathgeoipdatgz -T 20 $URL +$pathfetch -v -o $pathpbi$geoipdat.gz -T 20 $URL if [ "$?" -eq "0" ]; then - $pathgunzip -f $pathgeoipdatgz + $pathgunzip -f $pathpbi$geoipdat.gz echo; echo " ( MaxMind IPv4 GeoIP.dat has been updated )"; echo echo "Current Date/Timestamp:" - /bin/ls -alh $pathgeoipdat + /bin/ls -alh $pathpbi$geoipdat echo else echo; echo " => MaxMind IPv4 GeoIP.dat Update [ FAILED ]"; echo @@ -72,12 +76,12 @@ fi echo; echo " ** Downloading MaxMind GeoLite IPv6 Binary Database (For Reputation/Alerts Processes) **"; echo URL="http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz" -$pathfetch -v -o $pathgeoipdatgzv6 -T 20 $URL +$pathfetch -v -o $pathpbi$geoipdatv6.gz -T 20 $URL if [ "$?" -eq "0" ]; then - $pathgunzip -f $pathgeoipdatgzv6 + $pathgunzip -f $pathpbi$geoipdatv6.gz echo; echo " ( MaxMind IPv6 GeoIPv6.dat has been updated )"; echo echo "Current Date/Timestamp:" - /bin/ls -alh $pathgeoipdatv6 + /bin/ls -alh $pathpbi$geoipdatv6 echo else echo; echo " => MaxMind IPv6 GeoIPv6.dat Update [ FAILED ]"; echo |