diff options
author | Renato Botelho <renato@netgate.com> | 2015-07-27 09:35:04 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-07-27 09:35:04 -0300 |
commit | 95daa898f2f96e81eb6f912c0d84f62c8e98f306 (patch) | |
tree | c7c1d3100f306b95207383f331733449bdaef01b /config/suricata/suricata_defs.inc | |
parent | 51284cb907a4ed1fb26bd9d7cab2a0f67e24059e (diff) | |
parent | 5dc936ac2e1b346a35385db74d316c222a3e5de4 (diff) | |
download | pfsense-packages-95daa898f2f96e81eb6f912c0d84f62c8e98f306.tar.gz pfsense-packages-95daa898f2f96e81eb6f912c0d84f62c8e98f306.tar.bz2 pfsense-packages-95daa898f2f96e81eb6f912c0d84f62c8e98f306.zip |
Merge pull request #905 from bmeeks8/suricata-2.1.6
Diffstat (limited to 'config/suricata/suricata_defs.inc')
-rw-r--r-- | config/suricata/suricata_defs.inc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/config/suricata/suricata_defs.inc b/config/suricata/suricata_defs.inc index 5467f88c..29e0a368 100644 --- a/config/suricata/suricata_defs.inc +++ b/config/suricata/suricata_defs.inc @@ -52,7 +52,7 @@ if (!is_array($config['installedpackages']['suricata'])) $config['installedpackages']['suricata'] = array(); /* Get installed package version for display */ -$suricata_package_version = "Suricata {$config['installedpackages']['package'][get_pkg_id("suricata")]['version']}"; +$suricata_package_version = "{$config['installedpackages']['package'][get_pkg_id("suricata")]['version']}"; // Define the installed package version if (!defined('SURICATA_PKG_VER')) @@ -71,6 +71,16 @@ if (!defined('SURICATA_PBI_BASEDIR')) { if (!defined('SURICATA_PBI_BINDIR')) define('SURICATA_PBI_BINDIR', SURICATA_PBI_BASEDIR . 'bin/'); +if (!defined("SURICATA_BIN_VERSION")) { + // Grab the Suricata binary version programmatically + $suricatabindir = SURICATA_PBI_BINDIR; + $suricataver = exec_command("{$suricatabindir}suricata -V 2>&1 |/usr/bin/cut -c26-"); + if (!empty($suricataver)) + define("SURICATA_BIN_VERSION", $suricataver); + else + define("SURICATA_BIN_VERSION", ""); +} + // Define the name of the pf table used for IP blocks if (!defined('SURICATA_PF_TABLE')) define('SURICATA_PF_TABLE', 'snort2c'); |