From 35aa9f7691df6973acb0e6fa63eb4f0be533904b Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 22 Sep 2022 18:06:03 -0400
Subject: [PATCH] try setting mail.log permissions during setup

---
 setup/system.sh                 | 1 +
 tests/suites/_mail-functions.sh | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup/system.sh b/setup/system.sh
index 4c868fb6..2d5da2a5 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -407,4 +407,5 @@ EOF
 # Before miabldap v56, nsd.log was owned by nsd:nsd, which would
 # prevent rsyslog from writing to it. Fix the ownership.
 [ -e /var/log/nsd.log ] && chown syslog:adm /var/log/nsd.log
+[ -e /var/log/mail.log ] && chown syslog:adm /var/log/mail.log
 restart_service rsyslog
diff --git a/tests/suites/_mail-functions.sh b/tests/suites/_mail-functions.sh
index 3de85149..007ebfbc 100644
--- a/tests/suites/_mail-functions.sh
+++ b/tests/suites/_mail-functions.sh
@@ -366,10 +366,11 @@ flush_logs() {
 	else
 		pid=$(/usr/bin/pidof rsyslogd)
 	fi
-	if [ "$GITHUB_ACTIONS" = "true" ]; then
-		systemctl restart rsyslog >>$TEST_OF 2>&1
-		sleep 5
-	elif [ ! -z "$pid" ]; then
+	# if [ "$GITHUB_ACTIONS" = "true" ]; then
+	# 	systemctl restart rsyslog >>$TEST_OF 2>&1
+	# 	sleep 5
+	# elif [ ! -z "$pid" ]; then
+	if [ ! -z "$pid" ]; then
 		kill -HUP $pid >>$TEST_OF 2>&1
 		sleep 2
 	fi