From ec2785f6827e3ab4f7dc8d226d91b00dfb5ddf0e Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 30 Apr 2015 16:35:23 -0300 Subject: Fix suricata pbi detection for 2.3+ --- config/suricata/suricata_defs.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'config/suricata/suricata_defs.inc') diff --git a/config/suricata/suricata_defs.inc b/config/suricata/suricata_defs.inc index 7758a9f0..5467f88c 100644 --- a/config/suricata/suricata_defs.inc +++ b/config/suricata/suricata_defs.inc @@ -58,9 +58,14 @@ $suricata_package_version = "Suricata {$config['installedpackages']['package'][g if (!defined('SURICATA_PKG_VER')) define('SURICATA_PKG_VER', $suricata_package_version); +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); // Define the PBI base directory -if (!defined('SURICATA_PBI_BASEDIR')) - define('SURICATA_PBI_BASEDIR', '/usr/pbi/suricata-' . php_uname("m") . '/'); +if (!defined('SURICATA_PBI_BASEDIR')) { + if ($pf_version == "2.1" || $pf_version == "2.2") + define('SURICATA_PBI_BASEDIR', '/usr/pbi/suricata-' . php_uname("m") . '/'); + else + define('SURICATA_PBI_BASEDIR', '/usr/local/'); +} // Define the PBI binary wrapper directory if (!defined('SURICATA_PBI_BINDIR')) -- cgit v1.2.3