diff options
| author | Ermal <eri@pfsense.org> | 2014-05-02 07:05:31 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-05-02 07:05:31 +0000 |
| commit | bb88eed5e00ea1064d61020e59349b83f4c633d1 (patch) | |
| tree | c6ea0dd021518a60e3a52dbabeb96924fed7ea84 /config | |
| parent | 8c1bd093956b0964c7ed63ca7b9586567e354317 (diff) | |
| parent | c2e089749a4abc6dbdd4d5eb4fb23d47cbc42fda (diff) | |
| download | pfsense-packages-bb88eed5e00ea1064d61020e59349b83f4c633d1.tar.gz pfsense-packages-bb88eed5e00ea1064d61020e59349b83f4c633d1.tar.bz2 pfsense-packages-bb88eed5e00ea1064d61020e59349b83f4c633d1.zip | |
Merge pull request #653 from bmeeks8/snort-3.0.8
Diffstat (limited to 'config')
| -rwxr-xr-x | config/snort/snort.inc | 13 | ||||
| -rwxr-xr-x | config/snort/snort.xml | 4 | ||||
| -rw-r--r-- | config/snort/snort_migrate_config.php | 2 | ||||
| -rw-r--r-- | config/snort/snort_post_install.php | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc index f4fd93b9..c0c5756c 100755 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -54,7 +54,7 @@ if (empty($snort_version)) $snort_version = "2.9.6.0"; /* Used to indicate latest version of this include file has been loaded */ -$pfSense_snort_version = "3.0.7"; +$pfSense_snort_version = "3.0.8"; /* get installed package version for display */ $snort_package_version = "Snort {$config['installedpackages']['package'][get_pkg_id("snort")]['version']}"; @@ -755,8 +755,15 @@ function snort_rm_blocked_install_cron($should_install) { $snort_rm_blocked_expire = "2419200"; } - $command = "/usr/bin/nice -n20 /usr/local/sbin/expiretable -t $snort_rm_blocked_expire snort2c"; - install_cron_job($command, $should_install, $snort_rm_blocked_min, $snort_rm_blocked_hr, $snort_rm_blocked_mday, $snort_rm_blocked_month, $snort_rm_blocked_wday, "root"); + // First remove any existing "expiretable" jobs for Snort. + install_cron_job("snort2c", false); + + // Now either install the new or updated cron job, + // or return if "rm_blocked" is disabled + if ($should_install) { + $command = "/usr/bin/nice -n20 /usr/local/sbin/expiretable -t $snort_rm_blocked_expire snort2c"; + install_cron_job($command, $should_install, $snort_rm_blocked_min, $snort_rm_blocked_hr, $snort_rm_blocked_mday, $snort_rm_blocked_month, $snort_rm_blocked_wday, "root"); + } } /* func to install snort update */ diff --git a/config/snort/snort.xml b/config/snort/snort.xml index 9d52aa6c..ca99accf 100755 --- a/config/snort/snort.xml +++ b/config/snort/snort.xml @@ -47,7 +47,7 @@ <faq>Currently there are no FAQ items provided.</faq> <name>Snort</name> <version>2.9.6.0</version> - <title>Services:2.9.6.0 pkg v3.0.7</title> + <title>Services:2.9.6.0 pkg v3.0.8</title> <include_file>/usr/local/pkg/snort/snort.inc</include_file> <menu> <name>Snort</name> @@ -269,7 +269,7 @@ </custom_add_php_command> <custom_php_resync_config_command> <![CDATA[ - if ($GLOBALS['pfSense_snort_version'] == "3.0.7") + if ($GLOBALS['pfSense_snort_version'] == "3.0.8") sync_snort_package_config(); ]]> </custom_php_resync_config_command> diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index b3152d5d..d483ba47 100644 --- a/config/snort/snort_migrate_config.php +++ b/config/snort/snort_migrate_config.php @@ -365,7 +365,7 @@ unset($r); // Write out the new configuration to disk if we changed anything if ($updated_cfg) { - $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.7"; + $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.8"; log_error("[Snort] Saving configuration settings in new format..."); 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..."); diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php index dbac41ef..8d3c427d 100644 --- a/config/snort/snort_post_install.php +++ b/config/snort/snort_post_install.php @@ -1494,7 +1494,7 @@ 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.7"; +$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.8"; write_config("Snort pkg: post-install configuration saved."); /* Done with post-install, so clear flag */ |