From 6b6087d22937052dd8ad257fa122d6cb09d3bb24 Mon Sep 17 00:00:00 2001 From: robiscool Date: Thu, 26 Aug 2010 02:26:34 -0700 Subject: snort, redo the way barnyard2 is installed --- config/snort/snort.inc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 2f90f385..d8a7ad93 100644 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -643,12 +643,14 @@ function snort_postinstall() chdir ("/usr/local/bin/"); if ($pfsense_stable == 'yes') { exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/bin/7.3.x86/barnyard2'); - }else{ - if ($snort_arch == 'x86') { - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/bin/8.1x86/barnyard2'); - }else{ - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/bin/8.1x64/barnyard2'); - } + } + + if ($pfsense_stable == 'no' && $snort_arch == 'x86') { + exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/bin/8.1x86/barnyard2'); + } + + if ($pfsense_stable == 'no' && $snort_arch == 'x64') { + exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/bin/8.1x64/barnyard2'); } exec('/bin/chmod 755 /usr/local/bin/barnyard2'); -- cgit v1.2.3