diff --git a/plogical/findBWUsage.py b/plogical/findBWUsage.py index 87b77f3c9..cfd2172ea 100755 --- a/plogical/findBWUsage.py +++ b/plogical/findBWUsage.py @@ -18,8 +18,8 @@ class findBWUsage: if not os.path.exists(path): return 0 - - logData = open(path, 'r').readlines() + from processUtilities import ProcessUtilities + logData = ProcessUtilities.outputExecutioner('cat %s' % (path), 'nobody').splitlines() logDataLines = len(logData) if not os.path.exists("/home/"+domainName+"/logs"): @@ -148,5 +148,4 @@ class findBWUsage: return 1 - findBWUsage.startCalculations() \ No newline at end of file diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index fae518b87..0c58487fa 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -816,8 +816,8 @@ class MailServerManagerUtils(multi.Thread): try: if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: - command = 'yum remove postfix -y' - ProcessUtilities.executioner(command) + command = 'yum remove postfix* dovecot* -y' + ProcessUtilities.executioner(command, None, True) elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: command = 'apt-get -y remove postfix* dovecot*' ProcessUtilities.executioner(command, None, True) @@ -855,14 +855,13 @@ class MailServerManagerUtils(multi.Thread): command = 'yum install --enablerepo=gf-plus -y postfix3 postfix3-ldap postfix3-mysql postfix3-pcre' elif ProcessUtilities.decideDistro() == ProcessUtilities.cent8: - command = 'dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm' + command = 'dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/gf-release-latest.gf.el8.noarch.rpm' ProcessUtilities.executioner(command) command = 'dnf install --enablerepo=gf-plus postfix3 postfix3-mysql -y' ProcessUtilities.executioner(command) else: - import socket command = 'apt-get install -y debconf-utils' ProcessUtilities.executioner(command)