diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 115a5f45f..777004f9b 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -28,217 +28,35 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -255,14 +73,6 @@
- cyberpanelLoading
- allChecked
- == 'root'
- check_output
- split
- re.mat
- Backing up data..
- [46][5009]
externalApp
restoreDatabaseBackup
logging.writeToFile
@@ -282,9 +92,17 @@
/usr/local/CyberCP
os.remove
shutil.rmtree
+ setupVirtualEnv
+ python
+ setupDKIM
+ submitWebsiteCreation
+ submitWebsitecrea
+ createDomain
+ submitDomain
+ getpass
addRule
firewalld
- setupVirtualEnv
+ normal
admin.api == 1
@@ -313,7 +131,6 @@
-
-
+
@@ -602,18 +419,18 @@
-
+
-
+
-
+
-
+
@@ -697,20 +514,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -810,17 +613,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -917,13 +709,6 @@
-
-
-
-
-
-
-
@@ -1045,16 +830,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1166,36 +941,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1242,6 +991,7 @@
+
@@ -1359,7 +1109,6 @@
-
@@ -1367,6 +1116,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1374,5 +1139,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py
index 02e820c94..fd59aef1c 100755
--- a/plogical/mailUtilities.py
+++ b/plogical/mailUtilities.py
@@ -213,28 +213,29 @@ class mailUtilities:
if os.path.exists("/etc/opendkim/keys/" + virtualHostName):
return 1, "None"
- os.mkdir("/etc/opendkim/keys/" + virtualHostName)
+
+ path = '/etc/opendkim/keys/%s' % (virtualHostName)
+ command = 'mkdir %s' % (path)
+ ProcessUtilities.normalExecutioner(command)
## Generate keys
- FNULL = open(os.devnull, 'w')
-
- command = "opendkim-genkey -D /etc/opendkim/keys/" + virtualHostName + " -d " + virtualHostName + " -s default"
- subprocess.call(shlex.split(command),stdout=FNULL, stderr=subprocess.STDOUT)
-
+ command = "sudo opendkim-genkey -D /etc/opendkim/keys/%s -d %s -s default" % (virtualHostName, virtualHostName)
+ ProcessUtilities.normalExecutioner(command)
## Fix permissions
command = "chown -R root:opendkim /etc/opendkim/keys/" + virtualHostName
- subprocess.call(shlex.split(command))
+ ProcessUtilities.normalExecutioner(command)
command = "chmod 640 /etc/opendkim/keys/" + virtualHostName + "/default.private"
- subprocess.call(shlex.split(command))
+ ProcessUtilities.normalExecutioner(command)
command = "chmod 644 /etc/opendkim/keys/" + virtualHostName + "/default.txt"
- subprocess.call(shlex.split(command))
+ ProcessUtilities.normalExecutioner(command)
## Edit key file
+
keyTable = "/etc/opendkim/KeyTable"
configToWrite = "default._domainkey." + virtualHostName + " " + virtualHostName + ":default:/etc/opendkim/keys/" + virtualHostName + "/default.private\n"
@@ -272,7 +273,7 @@ class mailUtilities:
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(
- str(msg) + " [setupDKIM]")
+ str(msg) + " [setupDKIM:275]")
return 0, str(msg)
@staticmethod
diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py
index ff62c5230..8df579340 100755
--- a/plogical/processUtilities.py
+++ b/plogical/processUtilities.py
@@ -94,7 +94,11 @@ class ProcessUtilities(multi.Thread):
return 1
else:
return 0
+ except subprocess.CalledProcessError, msg:
+ logging.writeToFile('%s. [ProcessUtilities.normalExecutioner]' % (str(msg)))
+ return 0
except BaseException, msg:
+ logging.writeToFile('%s. [ProcessUtilities.normalExecutioner.Base]' % (str(msg)))
return 0
@staticmethod