diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2015-02-04 15:54:35 -0500 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2015-02-04 15:54:35 -0500 |
| commit | a7cf5cb9cc27188f899a4388f9ce0f7209a022c2 (patch) | |
| tree | 176d1356fe0ce2ab38990216c8f9b0bacfdbf59f /config/suricata/suricata.inc | |
| parent | 63b8709fcd142b2a306b25a1a50f0141aa3daf7c (diff) | |
| download | pfsense-packages-a7cf5cb9cc27188f899a4388f9ce0f7209a022c2.tar.gz pfsense-packages-a7cf5cb9cc27188f899a4388f9ce0f7209a022c2.tar.bz2 pfsense-packages-a7cf5cb9cc27188f899a4388f9ce0f7209a022c2.zip | |
Fix duplicated cron task bug when saving new time interval.
Diffstat (limited to 'config/suricata/suricata.inc')
| -rw-r--r-- | config/suricata/suricata.inc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc index 3de6a1d6..73208f61 100644 --- a/config/suricata/suricata.inc +++ b/config/suricata/suricata.inc @@ -646,9 +646,10 @@ function suricata_rules_up_install_cron($should_install=true) { if (suricata_cron_job_exists($command, TRUE, $suricata_rules_up_min, $suricata_rules_up_hr, $suricata_rules_up_mday, $suricata_rules_up_month, $suricata_rules_up_wday, "root")) return; - // Else install the new or updated cron job - if ($should_install) - install_cron_job($command, $should_install, $suricata_rules_up_min, $suricata_rules_up_hr, $suricata_rules_up_mday, $suricata_rules_up_month, $suricata_rules_up_wday, "root"); + // Else install the new or updated cron job by removing the + // existing job first, then installing the new or updated job. + install_cron_job("suricata_check_for_rule_updates.php", false); + install_cron_job($command, $should_install, $suricata_rules_up_min, $suricata_rules_up_hr, $suricata_rules_up_mday, $suricata_rules_up_month, $suricata_rules_up_wday, "root"); } function suricata_loglimit_install_cron($should_install=true) { @@ -664,7 +665,9 @@ function suricata_loglimit_install_cron($should_install=true) { if ($should_install && suricata_cron_job_exists("/usr/local/pkg/suricata/suricata_check_cron_misc.inc", TRUE, "*/5")) return; - // Else install the new or updated cron job + // Else install the new or updated cron job by removing the + // existing job first, then installing the new or updated job. + install_cron_job("suricata_check_cron_misc.inc", false); install_cron_job("/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/pkg/suricata/suricata_check_cron_misc.inc", $should_install, "*/5"); } @@ -769,10 +772,10 @@ function suricata_rm_blocked_install_cron($should_install) { if (suricata_cron_job_exists($command, TRUE, $suricata_rm_blocked_min, $suricata_rm_blocked_hr, $suricata_rm_blocked_mday, $suricata_rm_blocked_month, $suricata_rm_blocked_wday, "root")) return; - // Else install the new or updated cron job - if ($should_install) { - install_cron_job($command, $should_install, $suricata_rm_blocked_min, $suricata_rm_blocked_hr, $suricata_rm_blocked_mday, $suricata_rm_blocked_month, $suricata_rm_blocked_wday, "root"); - } + // Else install the new or updated cron job by removing the + // existing job first, then installing the new or updated job. + install_cron_job("{$suri_pf_table}", false); + install_cron_job($command, $should_install, $suricata_rm_blocked_min, $suricata_rm_blocked_hr, $suricata_rm_blocked_mday, $suricata_rm_blocked_month, $suricata_rm_blocked_wday, "root"); } function sync_suricata_package_config() { |