diff options
author | bmeeks8 <bmeeks8@bellsouth.net> | 2015-08-11 19:52:11 -0400 |
---|---|---|
committer | bmeeks8 <bmeeks8@bellsouth.net> | 2015-08-11 19:52:11 -0400 |
commit | 1424f3c70d34e58543de64840d708f88e5cb8379 (patch) | |
tree | d68c7c44509ad3482c5faa3fb79cbc8a81f9b024 | |
parent | 748a08538b18e620b5dbd0d51f027a1f0896f4ec (diff) | |
download | pfsense-packages-1424f3c70d34e58543de64840d708f88e5cb8379.tar.gz pfsense-packages-1424f3c70d34e58543de64840d708f88e5cb8379.tar.bz2 pfsense-packages-1424f3c70d34e58543de64840d708f88e5cb8379.zip |
Simplify future updates by removing hard-coded version strings.
-rw-r--r-- | config/snort/snort_migrate_config.php | 4 | ||||
-rw-r--r-- | config/snort/snort_post_install.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index ae1daf6a..edcbb2d5 100644 --- a/config/snort/snort_migrate_config.php +++ b/config/snort/snort_migrate_config.php @@ -541,10 +541,10 @@ unset($r); // Log a message if we changed anything if ($updated_cfg) { - $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.6"; log_error("[Snort] Settings successfully migrated to new configuration format..."); } -else +else { log_error("[Snort] Configuration version is current..."); +} ?> diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php index 280f0efe..bbb2642c 100644 --- a/config/snort/snort_post_install.php +++ b/config/snort/snort_post_install.php @@ -265,8 +265,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.2.6"; -write_config("Snort pkg v3.2.6: post-install configuration saved."); +$config['installedpackages']['snortglobal']['snort_config_ver'] = $config['installedpackages']['package'][get_pkg_id("snort")]['version']; +write_config("Snort pkg v{$config['installedpackages']['package'][get_pkg_id("snort")]['version']}: post-install configuration saved."); /* Done with post-install, so clear flag */ unset($g['snort_postinstall']); |