diff --git a/emailPremium/views.py b/emailPremium/views.py index dfc57b096..b99d820f5 100755 --- a/emailPremium/views.py +++ b/emailPremium/views.py @@ -1495,29 +1495,28 @@ def fetchRspamdSettings(request): TCPSocket = '' if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: - pass + clamavconfpath = '/etc/clamd.d/scan.conf' elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: clamavconfpath = "/etc/clamav/clamd.conf" - command = "sudo cat " + clamavconfpath - data = ProcessUtilities.outputExecutioner(command).splitlines() - for items in data: - if items.find('TCPSocket') > -1: - tempData = items.split(' ') - TCPSocket = tempData[1] - if items.find('TCPAddr') > -1: - tempData = items.split(' ') - TCPAddr = tempData[1] - if items.find('LogFile') > -1: - tempData = items.split(' ') - LogFile = tempData[1] - if items.find('Debug') > -1: - if items.find('Debug true') < 0: - clamav_Debug = False - continue - else: - clamav_Debug = True - + command = "sudo cat " + clamavconfpath + data = ProcessUtilities.outputExecutioner(command).splitlines() + for items in data: + if items.find('TCPSocket') > -1: + tempData = items.split(' ') + TCPSocket = tempData[1] + if items.find('TCPAddr') > -1: + tempData = items.split(' ') + TCPAddr = tempData[1] + if items.find('LogFile') > -1: + tempData = items.split(' ') + LogFile = tempData[1] + if items.find('Debug') > -1: + if items.find('Debug true') < 0: + clamav_Debug = False + continue + else: + clamav_Debug = True final_dic = {'fetchStatus': 1, @@ -1662,8 +1661,6 @@ def saveRedisConfigurations(request): except KeyError: return redirect(loadLoginPage) - - def saveclamavConfigurations(request): try: userID = request.session['userID'] @@ -1832,7 +1829,12 @@ def RestartRspamd(request): try: command = "systemctl restart rspamd" ProcessUtilities.executioner(command) - command = "systemctl restart clamav-daemon" + + if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: + command = 'systemctl start clamd@scan' + else: + command = "systemctl restart clamav-daemon" + ProcessUtilities.executioner(command) dic = {'status': 1, 'error_message': 'None',} @@ -2011,7 +2013,6 @@ def ReadReport(request): except KeyError: return redirect(loadLoginPage) - def debugEmailForSite(request): try: userID = request.session['userID'] @@ -2028,7 +2029,6 @@ def debugEmailForSite(request): except KeyError: return redirect(loadLoginPage) - def fixMailSSL(request): try: userID = request.session['userID'] diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index efa63231f..082d46ce8 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -989,35 +989,35 @@ LogFile /var/log/clamav/clamav.log clamav_Debug= jsondata['clamav_Debug'] if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: - pass + clamavconfpath = '/etc/clamd.d/scan.conf' elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: clamavconfpath = "/etc/clamav/clamd.conf" - f = open(clamavconfpath, "r") - dataa = f.read() - f.close() - data = dataa.splitlines() - writeDataToFile = open(clamavconfpath, "w") - for i in data: - if i.find('TCPSocket') > -1: - newitem = 'TCPSocket %s' % TCPSocket - writeDataToFile.writelines(newitem + '\n') - elif i.find('TCPAddr') > -1: - newitem = 'TCPAddr %s' % TCPAddr - writeDataToFile.writelines(newitem + '\n') - elif i.find('LogFile') > -1: - newitem = 'LogFile %s' % LogFile - writeDataToFile.writelines(newitem + '\n') - elif i.find('Debug =') > -1: - if clamav_Debug == True: - newitem = 'Debug true' - writeDataToFile.writelines(newitem + '\n') - elif clamav_Debug == False: - newitem = 'Debug false' - writeDataToFile.writelines(newitem + '\n') - else: - writeDataToFile.writelines(i + '\n') + f = open(clamavconfpath, "r") + dataa = f.read() + f.close() + data = dataa.splitlines() + writeDataToFile = open(clamavconfpath, "w") + for i in data: + if i.find('TCPSocket') > -1: + newitem = 'TCPSocket %s' % TCPSocket + writeDataToFile.writelines(newitem + '\n') + elif i.find('TCPAddr') > -1: + newitem = 'TCPAddr %s' % TCPAddr + writeDataToFile.writelines(newitem + '\n') + elif i.find('LogFile') > -1: + newitem = 'LogFile %s' % LogFile + writeDataToFile.writelines(newitem + '\n') + elif i.find('Debug =') > -1: + if clamav_Debug == True: + newitem = 'Debug true' + writeDataToFile.writelines(newitem + '\n') + elif clamav_Debug == False: + newitem = 'Debug false' + writeDataToFile.writelines(newitem + '\n') + else: + writeDataToFile.writelines(i + '\n') return 1, 'None' except BaseException as msg: