From 7ef5fac7369b31d60b2bd927840cd1d189cdee47 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 29 May 2020 23:10:00 +0500
Subject: [PATCH] enable firewalld centos 8

---
 emailPremium/templates/emailPremium/MailScanner.html | 2 +-
 install/firewallUtilities.py                         | 2 ++
 install/install.py                                   | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emailPremium/templates/emailPremium/MailScanner.html b/emailPremium/templates/emailPremium/MailScanner.html
index e663e6146..2728ff45b 100755
--- a/emailPremium/templates/emailPremium/MailScanner.html
+++ b/emailPremium/templates/emailPremium/MailScanner.html
@@ -54,7 +54,7 @@
                                     </div>
 
                                     <div ng-hide="SpamAssassinSuccessfullyInstalled" class="alert alert-success">
-                                        <p>{% trans "SpamAssassin successfully installed, refreshing page in 3 seconds.." %}</p>
+                                        <p>{% trans "MailScanner successfully installed, refreshing page in 3 seconds.." %}</p>
                                     </div>
                                 </div>
                             </div>
diff --git a/install/firewallUtilities.py b/install/firewallUtilities.py
index 8884eae16..92e4b6a81 100755
--- a/install/firewallUtilities.py
+++ b/install/firewallUtilities.py
@@ -56,6 +56,8 @@ class FirewallUtilities:
 
     @staticmethod
     def deleteRule(proto, port):
+        print('Adding port: %s' % (port))
+
         if port=="21":
             command = "sudo firewall-cmd --remove-service=ftp --permanent"
         else:
diff --git a/install/install.py b/install/install.py
index cfb9eee6e..8d7d6df38 100755
--- a/install/install.py
+++ b/install/install.py
@@ -1244,8 +1244,6 @@ imap_folder_list_limit = 0
 
     def installFirewalld(self):
 
-        if self.distro == cent8:
-            return 0
         if self.distro == ubuntu:
             self.removeUfw()
 
@@ -1260,7 +1258,7 @@ imap_folder_list_limit = 0
             preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
 
             ######
-            if self.distro == centos or self.distro == cent8:
+            if self.distro == centos:
                 # Not available in ubuntu
                 command = 'systemctl restart dbus'
                 preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)