aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBBcan177 <bbcan177@gmail.com>2015-02-05 23:36:10 -0500
committerBBcan177 <bbcan177@gmail.com>2015-02-05 23:36:10 -0500
commit14421b9e9165ce9c1618c9a310aec0f24ea48491 (patch)
tree1dcbde9dc4a9efd27fe21765f7351b08001b7678 /config
parentf5e0fe78aba607ea0f57dab2ce0bd95f023e6069 (diff)
downloadpfsense-packages-14421b9e9165ce9c1618c9a310aec0f24ea48491.tar.gz
pfsense-packages-14421b9e9165ce9c1618c9a310aec0f24ea48491.tar.bz2
pfsense-packages-14421b9e9165ce9c1618c9a310aec0f24ea48491.zip
pfBlockerNG - Remove previously used cc folder reference
- Missed removing the /cc folder reference in pfblockerng.xml. No Version bump is required as this is only required for new installations. The countrycodes.tar.bz2 file is provided as a backup in case the user has a download failure from MaxMind Inc. Website.
Diffstat (limited to 'config')
-rw-r--r--config/pfblockerng/pfblockerng.inc3
-rw-r--r--config/pfblockerng/pfblockerng.xml2
2 files changed, 3 insertions, 2 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index 0eb3ff43..793bf7a4 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -2343,7 +2343,8 @@ function pfblockerng_php_install_command() {
@rmdir_recursive("{$pfb['dbdir']}/cc");
# Uncompress Country Code File and delete Archive after extraction.
- exec("cd /{$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2");
+ @rename("{$pfb['dbdir']}/countrycodes.tar.bz2", "{$pfb['ccdir']}/countrycodes.tar.bz2");
+ exec("cd {$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2");
unlink_if_exists("{$pfb['ccdir']}/countrycodes.tar.bz2");
# Download MaxMind Files and Create Country Code files and Build Continent XML Files
update_output_window(gettext("Downloading MaxMind Country Databases. This may take a minute..."));
diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml
index e2f4b508..7c548921 100644
--- a/config/pfblockerng/pfblockerng.xml
+++ b/config/pfblockerng/pfblockerng.xml
@@ -131,7 +131,7 @@
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/countrycodes.tar.bz2</item>
- <prefix>/var/db/pfblockerng/cc/</prefix>
+ <prefix>/var/db/pfblockerng/</prefix>
<chmod>0444</chmod>
</additional_files_needed>
<additional_files_needed>