diff options
author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-19 21:48:44 -0400 |
---|---|---|
committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-19 21:48:44 -0400 |
commit | df80f9bf7542fe312d2f9b4bdc95c7beb80b8ab4 (patch) | |
tree | f02977e848e04461a6187a0394988cfd69209c0c /config/snort | |
parent | 059ff30969b6b03fcbfa240e516382f3ab340711 (diff) | |
download | pfsense-packages-df80f9bf7542fe312d2f9b4bdc95c7beb80b8ab4.tar.gz pfsense-packages-df80f9bf7542fe312d2f9b4bdc95c7beb80b8ab4.tar.bz2 pfsense-packages-df80f9bf7542fe312d2f9b4bdc95c7beb80b8ab4.zip |
Be sure preproc rules get moved to interface dir during post-install.
Diffstat (limited to 'config/snort')
-rwxr-xr-x | config/snort/snort_check_for_rule_updates.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php index 066f1741..218883a2 100755 --- a/config/snort/snort_check_for_rule_updates.php +++ b/config/snort/snort_check_for_rule_updates.php @@ -670,7 +670,7 @@ function snort_apply_customizations($snortcfg, $if_real) { /* Update the Preprocessor rules from the master configuration for the interface if Snort */ /* VRT rules are in use and the interface's preprocessor rules are not protected. */ - if ($vrt_enabled == 'on' && $snortcfg['protect_preproc_rules'] != 'on') { + if ($vrt_enabled == 'on' && ($snortcfg['protect_preproc_rules'] != 'on' || $g['snort_postinstall'])) { $preproc_files = glob("{$snortdir}/preproc_rules/*.rules"); foreach ($preproc_files as $file) { $newfile = basename($file); @@ -793,8 +793,10 @@ if ($snortdownload == 'on' || $emergingthreats == 'on' || $snortcommunityrules = touch("{$g['varrun_path']}/barnyard2_{$snortcfg['uuid']}.disabled"); snort_stop($snortcfg, $if_real); sleep(1); - if ($pkg_interface <> "console") + if ($pkg_interface <> "console") { + update_output_window(gettext("Starting Snort on " . convert_friendly_interface_to_friendly_descr($snortcfg['interface']) . "...")); snort_start($snortcfg, $if_real, FALSE); + } else snort_start($snortcfg, $if_real, TRUE); unlink_if_exists("{$g['varrun_path']}/snort_{$snortcfg['uuid']}.disabled"); |