diff options
| author | Thomas Schaefer <tom@tomschaefer.org> | 2011-08-27 16:29:52 -0400 |
|---|---|---|
| committer | Thomas Schaefer <tom@tomschaefer.org> | 2011-08-27 16:29:52 -0400 |
| commit | 8c1d25ef19657c2bd60ff0f6cd65b0a44edc9da2 (patch) | |
| tree | 4e8099b4dfbf2678a4949b01e4f9e632f38a219b | |
| parent | e967cd04876a291bf2f59252a78a3b3c8e709115 (diff) | |
| download | pfsense-packages-8c1d25ef19657c2bd60ff0f6cd65b0a44edc9da2.tar.gz pfsense-packages-8c1d25ef19657c2bd60ff0f6cd65b0a44edc9da2.tar.bz2 pfsense-packages-8c1d25ef19657c2bd60ff0f6cd65b0a44edc9da2.zip | |
remove file from xml config and put fetch in inc file. File size was being downloaded as 0bytes when in xml config
| -rw-r--r-- | config/countryblock/countryblock.inc | 3 | ||||
| -rw-r--r-- | config/countryblock/countryblock.xml | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index 36bf9aeb..f67fd76f 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -103,6 +103,8 @@ function php_install_command_cb() exec("cp /tmp/interfaces.txt /usr/local/www/packages/countryblock/interfaces.txt"); unlink_if_exists("/tmp/interfaces.txt"); + exec("/usr/bin/fetch -o /tmp https://raw.github.com/tommyboy180/pfsense-bin/2812cb9e1c9357bbf2027eff82096773bc4ddc5d/countryblock/CIDR.tar.gz"); + exec("cp /tmp/CIDR.tar.gz /usr/local/www/packages/countryblock/CIDR.tar.gz"); unlink_if_exists("/tmp/CIDR.tar.gz"); @@ -112,7 +114,6 @@ function php_install_command_cb() exec("mkdir /usr/local/www/packages/countryblock/lists"); exec("touch /usr/local/www/packages/countryblock/lists/countries.txt"); - conf_mount_ro(); config_unlock(); } diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index 933ab535..dbbefd18 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -164,11 +164,6 @@ <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/countryblock/email.tmp</item> </additional_files_needed> - <additional_files_needed> - <prefix>/tmp/</prefix> - <chmod>0755</chmod> - <item>https://raw.github.com/tommyboy180/pfsense-bin/2812cb9e1c9357bbf2027eff82096773bc4ddc5d/countryblock/CIDR.tar.gz</item> - </additional_files_needed> <fields> <field> <fielddescr>Variable One</fielddescr> |