Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-03-06 12:20:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: fix opendkim port on email settings reset; ref: https://app.clickup.com/t/86enggytc

Browse Source
This commit is contained in:
usmannasir
2024-01-22 10:29:19 +05:00
parent 8e0ee86c02
commit d1151684dc
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
plogical/mailUtilities.py
View File

@@ -356,27 +356,39 @@ class mailUtilities:
keyTable = "/etc/opendkim/KeyTable"
configToWrite = "default._domainkey." + actualDomain + " " + actualDomain + ":default:/etc/opendkim/keys/" + virtualHostName + "/default.private\n"
writeToFile = open(keyTable, 'a')
writeToFile.write(configToWrite)
writeToFile.close()
data = open(keyTable, 'r').read()
if data.find("default._domainkey." + actualDomain) == -1:
writeToFile = open(keyTable, 'a')
writeToFile.write(configToWrite)
writeToFile.close()
## Edit signing table
signingTable = "/etc/opendkim/SigningTable"
configToWrite = "*@" + actualDomain + " default._domainkey." + actualDomain + "\n"
writeToFile = open(signingTable, 'a')
writeToFile.write(configToWrite)
writeToFile.close()
data = open(signingTable, 'r').read()
if data.find("default._domainkey." + actualDomain) == -1:
writeToFile = open(signingTable, 'a')
writeToFile.write(configToWrite)
writeToFile.close()
## Trusted hosts
trustedHosts = "/etc/opendkim/TrustedHosts"
configToWrite = actualDomain + "\n"
writeToFile = open(trustedHosts, 'a')
writeToFile.write(configToWrite)
writeToFile.close()
data = open(trustedHosts, 'r').read()
if data.find(actualDomain) == -1:
writeToFile = open(trustedHosts, 'a')
writeToFile.write(configToWrite)
writeToFile.close()
## Restart Postfix and OpenDKIM
@@ -2149,6 +2161,14 @@ class MailServerManagerUtils(multi.Thread):
return 1
def SetupDKIMFromResetMail(self):
for website in Websites.objects.all():
mailUtilities.setupDKIM(website.domain)
for website in ChildDomains.objects.all():
mailUtilities.setupDKIM(website.domain)
def ResetEmailConfigurations(self):
try:
### Check if remote or local mysql
@@ -2221,6 +2241,8 @@ class MailServerManagerUtils(multi.Thread):
'configureOpenDKIM failed. [404].')
return 0
self.SetupDKIMFromResetMail()
if self.MailSSL:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'Setting up Mail Server SSL if any..,75')