From 6d1e6c31c7fcd7bb5d5dd48ff115ba8b09849164 Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Mon, 8 Sep 2014 21:11:44 -0400 Subject: Fix any duplicate UUIDs and 'dns-events.rules' entries in config. --- config/suricata/suricata_migrate_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/suricata/suricata_migrate_config.php') diff --git a/config/suricata/suricata_migrate_config.php b/config/suricata/suricata_migrate_config.php index ba13155b..3d6347ed 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; } -- cgit v1.2.3 From 101c875be3cbc8158b787eb480a0077135f70d35 Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Mon, 8 Sep 2014 23:28:54 -0400 Subject: Bump Suricata GUI package version to 2.0.3 v2.0.2 --- config/suricata/suricata_migrate_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/suricata/suricata_migrate_config.php') diff --git a/config/suricata/suricata_migrate_config.php b/config/suricata/suricata_migrate_config.php index 3d6347ed..4729109b 100644 --- a/config/suricata/suricata_migrate_config.php +++ b/config/suricata/suricata_migrate_config.php @@ -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..."); -- cgit v1.2.3