diff options
| -rw-r--r-- | config/countryblock/countryblock.inc | 8 | ||||
| -rw-r--r-- | config/countryblock/countryblock.xml | 7 | ||||
| -rw-r--r-- | config/freeradius.inc | 4 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
5 files changed, 11 insertions, 14 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index f8335d53..f67fd76f 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -103,8 +103,10 @@ function php_install_command_cb() exec("cp /tmp/interfaces.txt /usr/local/www/packages/countryblock/interfaces.txt"); unlink_if_exists("/tmp/interfaces.txt"); - exec("cp /tmp/CIDR.php /usr/local/www/packages/countryblock/CIDR.tar.gz"); - unlink_if_exists("/tmp/CIDR.php"); + 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"); exec("tar xzf /usr/local/www/packages/countryblock/CIDR.tar.gz -C /usr/local/www/packages/countryblock/CIDR"); exec("rm /usr/local/www/packages/countryblock/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(); } @@ -127,6 +128,7 @@ function deinstall_command_cb() exec("rm -R /usr/local/www/packages/countryblock/countryblocks"); exec("rm -R /usr/local/www/packages/countryblock"); exec("rm /usr/local/etc/rc.d/countryblock.sh"); + exec("rm /usr/local/pkg/pf/countryblock.sh"); exec("pfctl -t countryblock -T kill"); exec("sed -i -e '/countryblock/d' /tmp/rules.debug"); exec("pfctl -o basic -f /tmp/rules.debug"); diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index daee679b..dbbefd18 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -41,7 +41,7 @@ <requirements>Active Internet</requirements> <faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq> <name>Country Block Settings</name> - <version>0.2.1</version> + <version>0.2.2</version> <title>Settings</title> <include_file>/usr/local/pkg/countryblock.inc</include_file> <menu> @@ -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>http://tomschaefer.org/pfsense/repo/countryblock/CIDR.php</item> - </additional_files_needed> <fields> <field> <fielddescr>Variable One</fielddescr> diff --git a/config/freeradius.inc b/config/freeradius.inc index 6e81f0a0..a50f6c6d 100644 --- a/config/freeradius.inc +++ b/config/freeradius.inc @@ -26,8 +26,8 @@ function freeradius_install_command() { $rcfile = array(); $rcfile['file'] = 'radiusd.sh'; - $rcfile['start'] = 'radiusd -s &'; - $rcfile['stop'] = 'killall radiusd'; + $rcfile['start'] = 'killall -9 radiusd ; sleep 5 && radiusd -s &';; + $rcfile['stop'] = 'killall -9 radiusd ; sleep 5'; conf_mount_rw(); write_rcfile($rcfile); conf_mount_ro(); diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 8cdd8ba4..6cc923de 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -23,7 +23,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2.1</version> + <version>0.2.2</version> <status>Beta</status> <required_version>1.2.2</required_version> <maintainer>tom@tomschaefer.org</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 24e68686..27058021 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -89,7 +89,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.2.1</version> + <version>0.2.2</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> @@ -711,7 +711,7 @@ <website>http://www.freeradius.org/</website> <descr>A free implementation of the RADIUS protocol.</descr> <category>System</category> - <version>1.1.8</version> + <version>1.1.8 pkg v1.0</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>none</maintainer> |