diff options
| author | Tom Schaefer <tom@tomschaefer.org> | 2010-11-21 14:00:51 -0500 |
|---|---|---|
| committer | Tom Schaefer <tom@tomschaefer.org> | 2010-11-21 14:00:51 -0500 |
| commit | a83a9ead5da67714b501a01d63c4ab7a6c9d0f60 (patch) | |
| tree | 4c9ecd48d6e5ede615f45f456340ae5206fafdc4 | |
| parent | 804faa20f16f436637addb9cad680b0cb0336361 (diff) | |
| download | pfsense-packages-a83a9ead5da67714b501a01d63c4ab7a6c9d0f60.tar.gz pfsense-packages-a83a9ead5da67714b501a01d63c4ab7a6c9d0f60.tar.bz2 pfsense-packages-a83a9ead5da67714b501a01d63c4ab7a6c9d0f60.zip | |
IP-Blocklist Final added 6x compat
| -rw-r--r-- | config/ipblocklist/ipblocklist.inc | 9 | ||||
| -rw-r--r-- | config/ipblocklist/ipblocklist7.inc | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/config/ipblocklist/ipblocklist.inc b/config/ipblocklist/ipblocklist.inc index bc834a85..ed16048f 100644 --- a/config/ipblocklist/ipblocklist.inc +++ b/config/ipblocklist/ipblocklist.inc @@ -58,6 +58,7 @@ function php_install_command_ip() exec("pkg_add -r http://www.pfsense.org/packages/config/ipblocklist/perl-5.8.9_2.tbz"); exec("pkg_add -r http://www.pfsense.org/packages/config/ipblocklist/p5-Net-CIDR-0.13.tbz"); exec("pkg_add -r http://www.pfsense.org/packages/config/ipblocklist/compat7x.tbz"); + exec("pkg_add -r http://www.pfsense.org/packages/config/ipblocklist/compat6x.tbz"); //rename PHP files from .tmp to .php exec("cp /tmp/class.phpmailer.tmp /usr/local/www/packages/ipblocklist/class.phpmailer.php"); @@ -96,6 +97,14 @@ function php_install_command_ip() unlink_if_exists("/tmp/IP-Blocklist.sh"); //Touch files exec("touch /usr/local/www/packages/ipblocklist/wlists.txt"); + exec("/bin/mkdir /usr/local/www/packages/countryblock/lists"); + exec("/bin/mkdir /usr/local/www/packages/ipblocklist/lists"); + exec("/bin/mkdir /usr/local/www/packages/ipblocklist/Wlists"); + exec("/usr/bin/touch /usr/local/www/packages/countryblock/lists/countries.txt"); + exec("/usr/bin/touch /usr/local/www/packages/countryblock/countries-white.txt"); + exec("/usr/bin/touch /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw"); + exec("/usr/bin/touch /usr/local/www/packages/ipblocklist/Wlists/whitelist"); + exec("/usr/bin/touch /usr/local/www/packages/ipblocklist/OUTBOUND"); diff --git a/config/ipblocklist/ipblocklist7.inc b/config/ipblocklist/ipblocklist7.inc index b3036c20..f3f50066 100644 --- a/config/ipblocklist/ipblocklist7.inc +++ b/config/ipblocklist/ipblocklist7.inc @@ -115,8 +115,8 @@ function deinstall_command_ip() { conf_mount_rw(); $handle = popen("/usr/local/etc/rc.d/ipblocklist.sh stop", "r"); - unlink_if_exists("/usr/local/pkg/ipblocklist.xml"); - unlink_if_exists("/usr/local/pkg/ipblocklist.inc"); + unlink_if_exists("/usr/local/pkg/ipblocklist7.xml"); + unlink_if_exists("/usr/local/pkg/ipblocklist7.inc"); exec("rm -R /usr/local/www/packages/ipblocklist/ipblocklists"); exec("rm -R /usr/local/www/packages/ipblocklist"); exec("rm /usr/local/etc/rc.d/IP-Blocklist.sh"); |