diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-07-25 14:14:06 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-07-25 14:14:06 -0300 |
commit | 6cb45d2cadef9867239b8c2e6c40bc27be4f368b (patch) | |
tree | ce687f5b8b338e3b3e943ae6aa0ba5fa4b094a9e /config/snort/snort.inc | |
parent | 80c3f27abfe8ea80278072f06e162277e876a22d (diff) | |
parent | 8d9fa4aa122bc12e81faf5f81125edc2f64e3853 (diff) | |
download | pfsense-packages-6cb45d2cadef9867239b8c2e6c40bc27be4f368b.tar.gz pfsense-packages-6cb45d2cadef9867239b8c2e6c40bc27be4f368b.tar.bz2 pfsense-packages-6cb45d2cadef9867239b8c2e6c40bc27be4f368b.zip |
Merge pull request #691 from bmeeks8/master
Diffstat (limited to 'config/snort/snort.inc')
-rwxr-xr-x | config/snort/snort.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 362002cd..2a6d006a 100755 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -51,7 +51,7 @@ $snortver = array(); exec("/usr/local/bin/snort -V 2>&1 |/usr/bin/grep Version | /usr/bin/cut -c20-26", $snortver); /* Used to indicate latest version of this include file has been loaded */ -$pfSense_snort_version = "3.1"; +$pfSense_snort_version = "3.1.1"; /* get installed package version for display */ $snort_package_version = "Snort {$config['installedpackages']['package'][get_pkg_id("snort")]['version']}"; @@ -768,6 +768,13 @@ function snort_rm_blocked_install_cron($should_install) { function snort_rules_up_install_cron($should_install) { global $config, $g; + // Remove any existing job first + install_cron_job("snort_check_for_rule_updates.php", false); + + // If called with FALSE as argument, then we're done + if ($should_install == FALSE) + return; + $snort_rules_up_info_ck = $config['installedpackages']['snortglobal']['autorulesupdate7']; /* See if a customized start time has been set for rule file updates */ @@ -831,7 +838,7 @@ function snort_rules_up_install_cron($should_install) { $snort_rules_up_wday = "*"; } - $command = "/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/www/snort/snort_check_for_rule_updates.php"; + $command = "/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/pkg/snort/snort_check_for_rule_updates.php"; install_cron_job($command, $should_install, $snort_rules_up_min, $snort_rules_up_hr, $snort_rules_up_mday, $snort_rules_up_month, $snort_rules_up_wday, "root"); } |