From c7f3a9ca141386bacd285278fbda9ca087380d5c Mon Sep 17 00:00:00 2001 From: Tom Schaefer Date: Mon, 11 Apr 2011 22:21:18 -0400 Subject: Added scripts to /usr/local/pkg/pf --- config/countryblock/countryblock.inc | 1 + config/countryblock/countryblock.xml | 2 +- config/ipblocklist/7/ipblocklist.inc | 1 + config/ipblocklist/7/ipblocklist.xml | 2 +- config/ipblocklist/8/ipblocklist.inc | 1 + config/ipblocklist/8/ipblocklist.xml | 2 +- pkg_config.7.xml | 4 ++-- pkg_config.8.xml | 4 ++-- pkg_config.8.xml.amd64 | 4 ++-- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index 25077311..f7f9e33d 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -82,6 +82,7 @@ function php_install_command_cb() unlink_if_exists("/tmp/settings.tmp"); //Get scripts exec("cp /tmp/countryblock.sh /usr/local/etc/rc.d/countryblock.sh"); + exec("cp /tmp/countryblock.sh /usr/local/pkg/pf/countryblock.sh"); unlink_if_exists("/tmp/countryblock.sh"); exec("cp /tmp/execute.sh /usr/local/www/packages/countryblock/execute.sh"); unlink_if_exists("/tmp/execute.sh"); diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index a91a5ed7..57751376 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -41,7 +41,7 @@ Active Internet http://forum.pfsense.org/index.php/topic,25732.0.html Country Block Settings - 0.2.0 + 0.2.1 Settings /usr/local/pkg/countryblock.inc diff --git a/config/ipblocklist/7/ipblocklist.inc b/config/ipblocklist/7/ipblocklist.inc index d331dcc8..c3f5e4af 100755 --- a/config/ipblocklist/7/ipblocklist.inc +++ b/config/ipblocklist/7/ipblocklist.inc @@ -93,6 +93,7 @@ function php_install_command_ip() exec("cp /tmp/convert-execute.sh /usr/local/www/packages/ipblocklist/convert-execute.sh"); unlink_if_exists("/tmp/convert-execute.sh"); exec("cp /tmp/IP-Blocklist.sh /usr/local/etc/rc.d/IP-Blocklist.sh"); + exec("cp /tmp/IP-Blocklist.sh /usr/local/pkg/pf/IP-Blocklist.sh"); unlink_if_exists("/tmp/IP-Blocklist.sh"); //Touch files exec("touch /usr/local/www/packages/ipblocklist/wlists.txt"); diff --git a/config/ipblocklist/7/ipblocklist.xml b/config/ipblocklist/7/ipblocklist.xml index a2a910a3..5189fd5e 100755 --- a/config/ipblocklist/7/ipblocklist.xml +++ b/config/ipblocklist/7/ipblocklist.xml @@ -41,7 +41,7 @@ perl http://forum.pfsense.org/index.php/topic,24769.0.html IP Blocklist Settings - 0.3.1 + 0.3.2 Settings /usr/local/pkg/ipblocklist.inc diff --git a/config/ipblocklist/8/ipblocklist.inc b/config/ipblocklist/8/ipblocklist.inc index 4becef12..fca77379 100755 --- a/config/ipblocklist/8/ipblocklist.inc +++ b/config/ipblocklist/8/ipblocklist.inc @@ -94,6 +94,7 @@ function php_install_command_ip() exec("cp /tmp/convert-execute.sh /usr/local/www/packages/ipblocklist/convert-execute.sh"); unlink_if_exists("/tmp/convert-execute.sh"); exec("cp /tmp/IP-Blocklist.sh /usr/local/etc/rc.d/IP-Blocklist.sh"); + exec("cp /tmp/IP-Blocklist.sh /usr/local/pkg/pf/IP-Blocklist.sh"); unlink_if_exists("/tmp/IP-Blocklist.sh"); //Touch files exec("touch /usr/local/www/packages/ipblocklist/wlists.txt"); diff --git a/config/ipblocklist/8/ipblocklist.xml b/config/ipblocklist/8/ipblocklist.xml index 9d8cbc0f..99fba793 100755 --- a/config/ipblocklist/8/ipblocklist.xml +++ b/config/ipblocklist/8/ipblocklist.xml @@ -41,7 +41,7 @@ perl http://forum.pfsense.org/index.php/topic,24769.0.html IP Blocklist Settings - 0.3.1 + 0.3.2 Settings /usr/local/pkg/ipblocklist.inc diff --git a/pkg_config.7.xml b/pkg_config.7.xml index ecaabf2b..a3bfb9e5 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -23,7 +23,7 @@ http://forum.pfsense.org/index.php/topic,25732.0.html http://pfsense.org/packages/config/countryblock/countryblock.xml http://files.pfsense.org/packages/7/All/ - 0.2.0 + 0.2.1 Beta 1.2.2 tom@tomschaefer.org @@ -37,7 +37,7 @@ http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/7/ipblocklist.xml http://files.pfsense.org/packages/7/All/ - 0.3.1 + 0.3.2 Beta 1.2.2 tom@tomschaefer.org diff --git a/pkg_config.8.xml b/pkg_config.8.xml index e594f801..d127ffea 100755 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -39,7 +39,7 @@ http://forum.pfsense.org/index.php/topic,25732.0.html http://pfsense.org/packages/config/countryblock/countryblock.xml http://files.pfsense.org/packages/7/All/ - 0.2.0 + 0.2.1 Beta 2.0 tom@tomschaefer.org @@ -53,7 +53,7 @@ http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml http://files.pfsense.org/packages/7/All/ - 0.3.1 + 0.3.2 Beta 2.0 tom@tomschaefer.org diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 55a1827d..f556dd01 100755 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -89,7 +89,7 @@ http://forum.pfsense.org/index.php/topic,25732.0.html http://pfsense.org/packages/config/countryblock/countryblock.xml http://files.pfsense.org/packages/amd64/8/All/ - 0.2.0 + 0.2.1 Beta 2.0 tom@tomschaefer.org @@ -103,7 +103,7 @@ http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml http://files.pfsense.org/packages/amd64/8/All/ - 0.3.1 + 0.3.2 Beta 2.0 tom@tomschaefer.org -- cgit v1.2.3