diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-10-13 00:40:34 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-12-15 12:12:00 -0500 |
| commit | 2e86f084db4e7cf28a1541be64eec13e76909497 (patch) | |
| tree | 04ca20e640d582faa1d03151dee253a677de6e90 /config | |
| parent | b809f3b206086fb4b92c6737c018145f2fd001b5 (diff) | |
| download | pfsense-packages-2e86f084db4e7cf28a1541be64eec13e76909497.tar.gz pfsense-packages-2e86f084db4e7cf28a1541be64eec13e76909497.tar.bz2 pfsense-packages-2e86f084db4e7cf28a1541be64eec13e76909497.zip | |
Check and don't rebuild rules during post-install rules download.
Diffstat (limited to 'config')
| -rw-r--r-- | config/suricata/suricata_check_for_rule_updates.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/suricata/suricata_check_for_rule_updates.php b/config/suricata/suricata_check_for_rule_updates.php index 0a8f1937..9cb83d8c 100644 --- a/config/suricata/suricata_check_for_rule_updates.php +++ b/config/suricata/suricata_check_for_rule_updates.php @@ -678,10 +678,14 @@ if ($snortdownload == 'on' || $emergingthreats == 'on' || $snortcommunityrules = /* Start the rules rebuild proccess for each configured interface */ if (is_array($config['installedpackages']['suricata']['rule']) && - !empty($config['installedpackages']['suricata']['rule'])) { + count($config['installedpackages']['suricata']['rule']) > 0) { - /* Set the flag to force rule rebuilds since we downloaded new rules */ - $rebuild_rules = true; + /* Set the flag to force rule rebuilds since we downloaded new rules, */ + /* except when in post-install mode. Post-install does its own rebuild. */ + if ($g['suricata_postinstall']) + $rebuild_rules = false; + else + $rebuild_rules = true; /* Create configuration for each active Suricata interface */ foreach ($config['installedpackages']['suricata']['rule'] as $value) { |