From c63181df4ba6b606a32d78bf18f884b54be65c4e Mon Sep 17 00:00:00 2001
From: Paul Cammish <git@kelduum.net>
Date: Thu, 26 Mar 2020 11:31:49 +0000
Subject: [PATCH 1/2] Update cursor path, dont use sudo when not needed. Fixes
 issue #279

---
 CHANGELOG                            | 5 +++++
 monit/debian/changelog               | 7 +++++++
 monit/sbin/sympl-monit-failure-email | 4 ++--
 monit/system/sympl-monit.service     | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8f72829c..ba48848c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 CHANGELOG
 ---------
 
+2020-03-26
+  sympl-monit
+    * Don't use sudo when writing cursor. Fixes issue #279.
+    * Update sympl-monit.cursor path.
+
 2020-01-27
   sympl-webmail
     * Fixed importing contacts
diff --git a/monit/debian/changelog b/monit/debian/changelog
index d66ae2b1..9960edac 100644
--- a/monit/debian/changelog
+++ b/monit/debian/changelog
@@ -1,3 +1,10 @@
+sympl-monit (9.0.200326.0) stable; urgency=medium
+
+  * Don't use sudo when writing cursor. Fixes issue #279.
+  * Update sympl-monit.cursor path.
+
+ -- Paul Cammish <sympl@kelduum.net>  Thu, 26 Mar 2020 11:26:00 +0000
+
 sympl-monit (9.0.190706.0) stable; urgency=medium
 
   * Updated tests to use TLSv1.2
diff --git a/monit/sbin/sympl-monit-failure-email b/monit/sbin/sympl-monit-failure-email
index f9ead703..ed91bd3c 100644
--- a/monit/sbin/sympl-monit-failure-email
+++ b/monit/sbin/sympl-monit-failure-email
@@ -3,7 +3,7 @@
 set -e
 
 args="--since=today"
-[ -e "/var/tmp/sympl-monit.cursor" ] && args="--after-cursor=$(</var/tmp/sympl-monit.cursor)"
+[ -e "/tmp/sympl-monit.cursor" ] && args="--after-cursor=$(</tmp/sympl-monit.cursor)"
 
-journalctl -b0 $args -o cat -u "sympl-monit.service" | mail -s "Sympl monitor detected service failure" root
+journalctl -b0 $args -o cat -u "sympl-monit.service" | mail -s "Warning: sympl-monit detected service failure" root
 
diff --git a/monit/system/sympl-monit.service b/monit/system/sympl-monit.service
index fe46d279..eef4e4c0 100644
--- a/monit/system/sympl-monit.service
+++ b/monit/system/sympl-monit.service
@@ -4,6 +4,6 @@ OnFailure=sympl-monit-failure-email.service
 
 [Service]
 Type=simple
-ExecStartPre=/bin/sh -c 'journalctl -o cat -n 0 -u %n --show-cursor | cut -f3 -d" " | sudo -u nobody tee /var/tmp/sympl-monit.cursor >/dev/null'
+ExecStartPre=/bin/sh -c 'journalctl -o cat -n 0 -u %n --show-cursor | cut -f3 -d" " > /tmp/sympl-monit.cursor'
 ExecStart=/usr/sbin/sympl-monit -t email /etc/sympl/monit.d
 SuccessExitStatus=75
-- 
GitLab


From 3df2a959042a31171dfdda4d3825c78dcad83bae Mon Sep 17 00:00:00 2001
From: Paul Cammish <kelduum@mythic-beasts.com>
Date: Thu, 26 Mar 2020 17:04:13 +0000
Subject: [PATCH 2/2] ClamAV Fixes (stretch)

---
 autotest/test.d/01-setup | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/autotest/test.d/01-setup b/autotest/test.d/01-setup
index fffb7db1..b29e39bd 100755
--- a/autotest/test.d/01-setup
+++ b/autotest/test.d/01-setup
@@ -25,7 +25,7 @@ service clamav-freshclam start
 
 sleep 3
 
-echo -n "I: Waiting for clamav to download databases."
+echo -n "I: Waiting for clamav to download/update databases."
 for i in $(seq 1 100) ; do
   if [ -f "/var/lib/clamav/main.cvd" -o -f "/var/lib/clamav/main.cld" ] ; then
     echo -n ' 1/3 '
@@ -52,6 +52,17 @@ for i in $(seq 1 100) ; do
   sleep 1
 done
 
+# horrible hack
+if [ -f "/var/lib/clamav/bytecode.cvd" -o -f "/var/lib/clamav/bytecode.cld" ] && [ -f "/var/lib/clamav/daily.cvd" -o -f "/var/lib/clamav/daily.cld" ] && [ -f "/var/lib/clamav/main.cvd" -o -f "/var/lib/clamav/main.cld" ] ; then
+  echo "We have what look to be valid definitions..."
+else
+  echo "Failed to download clamAV definitions, going to fallback."
+  cd /var/lib/clamav/
+  wget -qO clamav.tar.gz http://sympl.host/clamav.tar.gz
+  tar -xvf clamav.tar.gz
+fi
+
+
 # Start clamav, whatever state it's currently in
 systemctl unmask clamav-daemon
 service clamav-daemon stop
-- 
GitLab