From a024fc4e756a5e388fc2e721da6192ed78d5bf1f Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 27 Jul 2022 13:42:07 +0500
Subject: [PATCH] rspamd issues for ubuntu

---
 plogical/mailUtilities.py | 45 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py
index bc3d65a38..859e20fa7 100755
--- a/plogical/mailUtilities.py
+++ b/plogical/mailUtilities.py
@@ -685,13 +685,52 @@ LogFile /var/log/clamd.scan/clamav.log
                     writeToFile.close()
 
                     command = 'freshclam'
-                    ProcessUtilities.normalExecutioner(command, False, 'clamscan')
+                    ProcessUtilities.normalExecutioner(command)
 
                     command = 'systemctl start clamd@scan'
-                    ProcessUtilities.normalExecutioner(command, False, 'clamscan')
+                    ProcessUtilities.normalExecutioner(command)
 
                     command = 'systemctl restart rspamd'
-                    ProcessUtilities.normalExecutioner(command, False, 'clamscan')
+                    ProcessUtilities.normalExecutioner(command)
+                elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
+
+                    command = 'usermod -a -G clamav _rspamd'
+                    ProcessUtilities.normalExecutioner(command)
+
+                    command = 'chown -R clamav:clamav /var/run/clamav'
+                    ProcessUtilities.normalExecutioner(command)
+
+                    clamavcontent = """
+User clamav
+PidFile /var/run/clamav/clamd.pid
+TCPSocket 3310
+TCPAddr 127.0.0.1
+ConcurrentDatabaseReload no
+Debug false
+FixStaleSocket true
+LocalSocketMode 666
+ScanMail true
+ScanArchive true
+Debug false
+LogFile /var/log/clamav/clamav.log
+"""
+                    writeToFile = open('/etc/clamav/clamd.conf', 'w')
+                    writeToFile.write(clamavcontent)
+                    writeToFile.close()
+
+
+                    writeToFile = open(mailUtilities.RspamdInstallLogPath, 'a')
+                    writeToFile.writelines("Updating Freshclam database..\n")
+                    writeToFile.close()
+
+                    command = 'freshclam'
+                    ProcessUtilities.normalExecutioner(command)
+
+                    command = 'service clamav-daemon restart'
+                    ProcessUtilities.normalExecutioner(command)
+
+                    command = 'systemctl restart rspamd'
+                    ProcessUtilities.normalExecutioner(command)
 
                 writeToFile = open(mailUtilities.RspamdInstallLogPath, 'a')
                 writeToFile.writelines("Rspamd Installed.[200]\n")