aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTom Schaefer <tom@tomschaefer.org>2010-11-21 13:23:20 -0500
committerTom Schaefer <tom@tomschaefer.org>2010-11-21 13:23:20 -0500
commit804faa20f16f436637addb9cad680b0cb0336361 (patch)
tree0bd8b05929813e1f966404a97d29c5c721128a3e /config
parent3a266d46b9baa0d7cdea3ae216ac9d20d31d7c70 (diff)
downloadpfsense-packages-804faa20f16f436637addb9cad680b0cb0336361.tar.gz
pfsense-packages-804faa20f16f436637addb9cad680b0cb0336361.tar.bz2
pfsense-packages-804faa20f16f436637addb9cad680b0cb0336361.zip
Fixed 3.0 bug
Diffstat (limited to 'config')
-rw-r--r--config/ipblocklist/IP-Blocklist.sh12
-rw-r--r--config/ipblocklist/convert-execute.sh5
2 files changed, 14 insertions, 3 deletions
diff --git a/config/ipblocklist/IP-Blocklist.sh b/config/ipblocklist/IP-Blocklist.sh
index 009f970c..442d9443 100644
--- a/config/ipblocklist/IP-Blocklist.sh
+++ b/config/ipblocklist/IP-Blocklist.sh
@@ -30,14 +30,22 @@ Wfilelist="/usr/local/www/packages/ipblocklist/file_Wlist.txt"
for fileline in $(cat $filelist); do
iplist="/usr/local/www/packages/ipblocklist/lists/$fileline"
iplistout="/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw"
-/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $iplist $iplistout
+#sleep 5
+#echo "file name: "
+#echo $iplist
+#sleep 5
+if [ "$iplist" != "/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw" ]; then
+ #/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $iplist $iplistout
+ #echo "THIS JUST RAN"
+fi
+#sleep 5
done
#Whitelist
for Wfileline in $(cat $Wfilelist); do
Wiplist="/usr/local/www/packages/ipblocklist/Wlists/$Wfileline"
Wiplistout="/usr/local/www/packages/ipblocklist/Wlists/whitelist"
-/usr/bin/perl convert.pl $Wiplist $Wiplistout
+/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $Wiplist $Wiplistout
done
#echo "ipfw made"
diff --git a/config/ipblocklist/convert-execute.sh b/config/ipblocklist/convert-execute.sh
index 0dddc42f..961015e0 100644
--- a/config/ipblocklist/convert-execute.sh
+++ b/config/ipblocklist/convert-execute.sh
@@ -30,7 +30,10 @@ Wfilelist="/usr/local/www/packages/ipblocklist/file_Wlist.txt"
for fileline in $(cat $filelist); do
iplist="/usr/local/www/packages/ipblocklist/lists/$fileline"
iplistout="/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw"
-/usr/bin/perl convert.pl $iplist $iplistout
+if [ "$iplist" != "/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw" ]; then
+ /usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $iplist $iplistout
+ #echo "THIS JUST RAN"
+fi
done
#Whitelist