From 477886371b45c363d02727afce409a03a99d516a Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Fri, 5 Dec 2014 10:20:17 -0500 Subject: Make better use of previous DEFINES in new ones. --- config/suricata/suricata_defs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/suricata') diff --git a/config/suricata/suricata_defs.inc b/config/suricata/suricata_defs.inc index 0a34b391..7758a9f0 100644 --- a/config/suricata/suricata_defs.inc +++ b/config/suricata/suricata_defs.inc @@ -64,7 +64,7 @@ if (!defined('SURICATA_PBI_BASEDIR')) // Define the PBI binary wrapper directory if (!defined('SURICATA_PBI_BINDIR')) - define('SURICATA_PBI_BINDIR', '/usr/pbi/suricata-' . php_uname("m") . '/bin/'); + define('SURICATA_PBI_BINDIR', SURICATA_PBI_BASEDIR . 'bin/'); // Define the name of the pf table used for IP blocks if (!defined('SURICATA_PF_TABLE')) @@ -72,7 +72,7 @@ if (!defined('SURICATA_PF_TABLE')) // Create some other useful defines if (!defined('SURICATADIR')) - define('SURICATADIR', '/usr/pbi/suricata-' . php_uname("m") . '/etc/suricata/'); + define('SURICATADIR', SURICATA_PBI_BASEDIR . 'etc/suricata/'); if (!defined('SURICATALOGDIR')) define('SURICATALOGDIR', "{$g['varlog_path']}/suricata/"); if (!defined('SURICATA_RULES_UPD_LOGFILE')) -- cgit v1.2.3