aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-05-14 14:55:39 -0400
committerbmeeks8 <bmeeks8@bellsouth.net>2014-05-14 14:55:39 -0400
commit2d30e78dba257910ad69e4a3cb043c2a97704266 (patch)
treedb9eda0d8ba135fc02b052daf50c70e7d8728351 /config
parent0bab9a3ac108381f4b7308c1e2968dc3fe48db39 (diff)
downloadpfsense-packages-2d30e78dba257910ad69e4a3cb043c2a97704266.tar.gz
pfsense-packages-2d30e78dba257910ad69e4a3cb043c2a97704266.tar.bz2
pfsense-packages-2d30e78dba257910ad69e4a3cb043c2a97704266.zip
Test for 2.2 install, adjust conf file path accordingly.
Diffstat (limited to 'config')
-rw-r--r--config/suricata/suricata.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc
index c767f2d0..6f0bdc8f 100644
--- a/config/suricata/suricata.inc
+++ b/config/suricata/suricata.inc
@@ -60,7 +60,12 @@ define('SURICATA_PKG_VER', $suricata_package_version);
define('SURICATA_PF_TABLE', 'snort2c');
// Create some other useful defines
-define('SURICATADIR', '/usr/pbi/suricata-' . php_uname("m") . '/etc/suricata/');
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version >= 2.2)
+ define('SURICATADIR', '/usr/pbi/suricata-' . php_uname("m") . '/local/etc/suricata/');
+else
+ define('SURICATADIR', '/usr/pbi/suricata-' . php_uname("m") . '/etc/suricata/');
+
define('SURICATALOGDIR', '/var/log/suricata/');
define('RULES_UPD_LOGFILE', SURICATALOGDIR . 'suricata_rules_update.log');
define('ENFORCING_RULES_FILENAME', 'suricata.rules');