diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-05-21 15:18:51 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-05-21 15:18:51 -0300 |
| commit | 4c3480ad5ff3d019998bcec1477c357c5e876c11 (patch) | |
| tree | 787aa92b93df42146e610b72225b93d2fc001606 /config/suricata/suricata.inc | |
| parent | 2756de4fc9eb14746bf0d5be7e83826958723201 (diff) | |
| parent | 97e0eebfbdaa33bd2e7fbf674da94998abf81ced (diff) | |
| download | pfsense-packages-4c3480ad5ff3d019998bcec1477c357c5e876c11.tar.gz pfsense-packages-4c3480ad5ff3d019998bcec1477c357c5e876c11.tar.bz2 pfsense-packages-4c3480ad5ff3d019998bcec1477c357c5e876c11.zip | |
Merge pull request #659 from bmeeks8/suricata-1.0.2
Diffstat (limited to 'config/suricata/suricata.inc')
| -rw-r--r-- | config/suricata/suricata.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc index c767f2d0..89bb572f 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'); @@ -933,7 +938,7 @@ function suricata_build_sid_msg_map($rules_path, $sid_file) { natcasesort($sidMap); // Now print the result to the supplied file - @file_put_contents($sid_file, "#v2\n# sid-msg.map file auto-generated by Snort.\n\n"); + @file_put_contents($sid_file, "#v2\n# sid-msg.map file auto-generated by Suricata.\n\n"); @file_put_contents($sid_file, array_values($sidMap), FILE_APPEND); } |