From 23763fd8bc8b2a754ff0ee5e3503e38d9f186a66 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 27 Feb 2020 17:38:53 +0500 Subject: [PATCH] change checkIfSpamAssassinInstalled method --- plogical/mailUtilities.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index eb20a73a2..485206df0 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -483,15 +483,15 @@ milter_default_action = accept def checkIfSpamAssassinInstalled(): try: - path = "/etc/mail/spamassassin/local.cf" + path = "/etc/postfix/master.cf" - command = "sudo cat " + path + command = "cat " + path output = ProcessUtilities.outputExecutioner(command) - if output.find('No such') > -1: - return 0 - else: + if output.find('content_filter=spamassassin') > -1: return 1 + else: + return 0 except BaseException as msg: logging.CyberCPLogFileWriter.writeToFile(