aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/suricata/suricata.inc6
-rw-r--r--config/suricata/suricata_check_cron_misc.inc4
2 files changed, 7 insertions, 3 deletions
diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc
index 7936d41c..b5f5fb56 100644
--- a/config/suricata/suricata.inc
+++ b/config/suricata/suricata.inc
@@ -406,7 +406,7 @@ function suricata_build_list($suricatacfg, $listname = "", $whitelist = false) {
return $valresult;
}
-function suricata_rules_up_install_cron($should_install) {
+function suricata_rules_up_install_cron($should_install=true) {
global $config, $g;
$command = "/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/www/suricata/suricata_check_for_rule_updates.php";
@@ -479,7 +479,7 @@ function suricata_rules_up_install_cron($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");
}
-function suricata_loglimit_install_cron($should_install) {
+function suricata_loglimit_install_cron($should_install=true) {
install_cron_job("/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/pkg/suricata/suricata_check_cron_misc.inc", $should_install, "*/5");
}
@@ -516,7 +516,7 @@ function sync_suricata_package_config() {
$suricataglob = $config['installedpackages']['suricata']['config'][0];
// setup the log directory size check job if enabled
- suricata_loglimit_install_cron($suricataglob['suricataloglimit'] == 'on' ? true : false);
+ suricata_loglimit_install_cron();
// setup the suricata rules update job if enabled
suricata_rules_up_install_cron($suricataglob['autoruleupdate'] != "never_up" ? true : false);
diff --git a/config/suricata/suricata_check_cron_misc.inc b/config/suricata/suricata_check_cron_misc.inc
index 25e8bb8a..b9ba3fb7 100644
--- a/config/suricata/suricata_check_cron_misc.inc
+++ b/config/suricata/suricata_check_cron_misc.inc
@@ -30,6 +30,8 @@
require_once("/usr/local/pkg/suricata/suricata.inc");
+global $g, $config;
+
function suricata_check_dir_size_limit($suricataloglimitsize) {
/********************************************************
@@ -41,6 +43,8 @@ function suricata_check_dir_size_limit($suricataloglimitsize) {
* On Entry: $surictaaloglimitsize = dir size limit *
* in megabytes *
********************************************************/
+
+ global $config;
// Convert Log Limit Size setting from MB to KB
$suricataloglimitsizeKB = round($suricataloglimitsize * 1024);