From 3b146a40df9226dadd392f6d8e3d1d82d5cca681 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 9 Jul 2020 21:26:31 +0200
Subject: [PATCH] Redirect output, otherwise ends up polluting cron.log
---
server/lib/classes/cron.d/100-monitor_iptables.inc.php | 4 ++--
server/plugins-available/backup_plugin.inc.php | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/lib/classes/cron.d/100-monitor_iptables.inc.php b/server/lib/classes/cron.d/100-monitor_iptables.inc.php
index 1ad11d9ecc..2bf9404735 100644
--- a/server/lib/classes/cron.d/100-monitor_iptables.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_iptables.inc.php
@@ -67,7 +67,7 @@ class cronjob_monitor_iptables extends cronjob {
$type = 'iptables_rules';
/* This monitoring is only available if fail2ban is installed */
- system('which iptables', $retval); // Debian, Ubuntu, Fedora
+ system('which iptables > /dev/null', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
$data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S 2>/dev/null');
@@ -83,7 +83,7 @@ class cronjob_monitor_iptables extends cronjob {
/* This monitoring is only available if fail2ban is installed */
- system('which ip6tables', $retval); // Debian, Ubuntu, Fedora
+ system('which ip6tables > /dev/null', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
$data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S 2>/dev/null');
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 53b8d6d288..ffbc5a6b79 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -322,4 +322,3 @@ class backup_plugin {
} // end class
?>
-
--
GitLab