diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-09-09 14:37:15 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-09-09 14:37:15 -0300 |
commit | b40de132a39680cd8d096e14d9f968adac3c82e0 (patch) | |
tree | 6d25fb1594a31c371686f5a2350ca89836cdfce8 /config/suricata/suricata_migrate_config.php | |
parent | 8a33d84b6e7d52e2e7dd414c03428ce6da0296a2 (diff) | |
parent | 942f82201a14aebc97f872aeddae893b9a1e0a55 (diff) | |
download | pfsense-packages-b40de132a39680cd8d096e14d9f968adac3c82e0.tar.gz pfsense-packages-b40de132a39680cd8d096e14d9f968adac3c82e0.tar.bz2 pfsense-packages-b40de132a39680cd8d096e14d9f968adac3c82e0.zip |
Merge pull request #698 from bmeeks8/suricata-2.0.3-v2.0.2
Diffstat (limited to 'config/suricata/suricata_migrate_config.php')
-rw-r--r-- | config/suricata/suricata_migrate_config.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/suricata/suricata_migrate_config.php b/config/suricata/suricata_migrate_config.php index ba13155b..4729109b 100644 --- a/config/suricata/suricata_migrate_config.php +++ b/config/suricata/suricata_migrate_config.php @@ -118,7 +118,7 @@ foreach ($rule as &$r) { /***********************************************************/ /* Add the new 'dns-events.rules' file to the rulesets. */ /***********************************************************/ - if (strpos("dns-events.rules", $pconfig['rulesets']) === FALSE) { + if (strpos($pconfig['rulesets'], "dns-events.rules") === FALSE) { $pconfig['rulesets'] = rtrim($pconfig['rulesets'], "||") . "||dns-events.rules"; $updated_cfg = true; } @@ -344,7 +344,7 @@ unset($r); // Write out the new configuration to disk if we changed anything if ($updated_cfg) { - $config['installedpackages']['suricata']['config'][0]['suricata_config_ver'] = "2.0"; + $config['installedpackages']['suricata']['config'][0]['suricata_config_ver'] = "2.0.2"; log_error("[Suricata] Saving configuration settings in new format..."); write_config("Suricata pkg: migrate existing settings to new format during package upgrade."); log_error("[Suricata] Settings successfully migrated to new configuration format..."); |