diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-04-15 11:09:50 -0400 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-04-28 08:03:38 +0000 |
| commit | 9e6f4b690ff87117f2f46b9b7ed68455042181b7 (patch) | |
| tree | ad4837653ce41416ca0da29dbdded5fbdc67806d /config/snort | |
| parent | 668f8ffabcd3f437aedc1679a96479bb3c96ebc3 (diff) | |
| download | pfsense-packages-9e6f4b690ff87117f2f46b9b7ed68455042181b7.tar.gz pfsense-packages-9e6f4b690ff87117f2f46b9b7ed68455042181b7.tar.bz2 pfsense-packages-9e6f4b690ff87117f2f46b9b7ed68455042181b7.zip | |
Add history tag text to write_config() calls and bump pkg version.
Diffstat (limited to 'config/snort')
| -rw-r--r-- | config/snort/snort_migrate_config.php | 5 | ||||
| -rw-r--r-- | config/snort/snort_post_install.php | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index d7a20726..b3152d5d 100644 --- a/config/snort/snort_migrate_config.php +++ b/config/snort/snort_migrate_config.php @@ -339,7 +339,6 @@ foreach ($rule as &$r) { $pconfig['barnyard_dbpwd'] = base64_encode($matches[2][$k]); } $pconfig['barnyard_mysql_enable'] = 'on'; - $pconfig['barnyard_enable'] = 'on'; unset($pconfig['barnyard_mysql']); } // Since Barnyard2 was enabled, configure the new archived log settings @@ -366,9 +365,9 @@ unset($r); // Write out the new configuration to disk if we changed anything if ($updated_cfg) { - $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.5"; + $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.7"; log_error("[Snort] Saving configuration settings in new format..."); - write_config(); + write_config("Snort pkg: migrate existing settings to new format as part of package upgrade."); log_error("[Snort] Settings successfully migrated to new configuration format..."); } else diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php index c2b46cd5..dbac41ef 100644 --- a/config/snort/snort_post_install.php +++ b/config/snort/snort_post_install.php @@ -1423,7 +1423,7 @@ if ($pkgid >= 0) { log_error(gettext("[Snort] Removing legacy 'Dashboard Widget: Snort' package because the widget is now part of the Snort package.")); unset($config['installedpackages']['package'][$pkgid]); unlink_if_exists("/usr/local/pkg/widget-snort.xml"); - write_config(); + write_config("Snort pkg: removed legacy Snort Dashboard Widget."); } /* Define a default Dashboard Widget Container for Snort */ @@ -1494,8 +1494,8 @@ if (stristr($config['widgets']['sequence'], "snort_alerts-container") === FALSE) $config['widgets']['sequence'] .= ",{$snort_widget_container}"; /* Update Snort package version in configuration */ -$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.5"; -write_config(); +$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.7"; +write_config("Snort pkg: post-install configuration saved."); /* Done with post-install, so clear flag */ unset($g['snort_postinstall']); |