Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-14 01:06:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: dkim keys generation for subdomains

Browse Source
This commit is contained in:
Usman Nasir
2020-01-30 20:29:13 +05:00
parent 8982422edc
commit ad9981c2a4
3 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plogical/mailUtilities.py
View File

@@ -217,7 +217,7 @@ class mailUtilities:
#extractDomain = tldextract.extract(virtualHostName)
#virtualHostName = extractDomain.domain + '.' + extractDomain.suffix
if os.path.exists("/etc/opendkim/keys/" + virtualHostName):
if os.path.exists("/etc/opendkim/keys/" + virtualHostName + "/default.txt"):
return 1, "None"
@@ -227,7 +227,11 @@ class mailUtilities:
## Generate keys
command = "opendkim-genkey -D /etc/opendkim/keys/%s -d %s -s default" % (virtualHostName, virtualHostName)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
command = "/usr/sbin/opendkim-genkey -D /etc/opendkim/keys/%s -d %s -s default" % (virtualHostName, virtualHostName)
else:
command = "opendkim-genkey -D /etc/opendkim/keys/%s -d %s -s default" % (
virtualHostName, virtualHostName)
ProcessUtilities.normalExecutioner(command)
## Fix permissions