From e967cd04876a291bf2f59252a78a3b3c8e709115 Mon Sep 17 00:00:00 2001 From: Thomas Schaefer Date: Sat, 27 Aug 2011 15:25:01 -0400 Subject: changed CIDR.tar.gz URL to github (To my personal repo) and corrected uninstall bug --- config/countryblock/countryblock.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config/countryblock/countryblock.inc') diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index f8335d53..36bf9aeb 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -103,8 +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("cp /tmp/CIDR.php /usr/local/www/packages/countryblock/CIDR.tar.gz"); - unlink_if_exists("/tmp/CIDR.php"); + 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"); @@ -127,6 +127,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"); -- cgit v1.2.3