From 5d188ce90a5b9278f37f7220e7ffcc9ef80969b6 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 5 Feb 2020 23:18:08 +0500
Subject: [PATCH] bug fix: create mail domain if mail services isntalled

---
 plogical/virtualHostUtilities.py | 67 ++++++++++++++++----------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py
index 4bba0b57a..b9666d9e4 100755
--- a/plogical/virtualHostUtilities.py
+++ b/plogical/virtualHostUtilities.py
@@ -216,45 +216,46 @@ class virtualHostUtilities:
 
             dovecotPath = '/etc/dovecot/dovecot.conf'
 
-            dovecotContent = open(dovecotPath, 'r').read()
+            if os.path.exists(dovecotPath):
+                dovecotContent = open(dovecotPath, 'r').read()
 
-            if dovecotContent.find(childDomain) == -1:
-                content = """\nlocal_name %s {
-  ssl_cert = </etc/letsencrypt/live/%s/fullchain.pem
-  ssl_key = </etc/letsencrypt/live/%s/privkey.pem
-}\n""" % (childDomain, childDomain, childDomain)
+                if dovecotContent.find(childDomain) == -1:
+                    content = """\nlocal_name %s {
+      ssl_cert = </etc/letsencrypt/live/%s/fullchain.pem
+      ssl_key = </etc/letsencrypt/live/%s/privkey.pem
+    }\n""" % (childDomain, childDomain, childDomain)
 
-                writeToFile = open(dovecotPath, 'a')
-                writeToFile.write(content)
+                    writeToFile = open(dovecotPath, 'a')
+                    writeToFile.write(content)
+                    writeToFile.close()
+
+                    command = 'systemctl restart dovecot'
+                    ProcessUtilities.executioner(command)
+
+                ### Update postfix configurations
+
+                postFixPath = '/etc/postfix/main.cf'
+
+                postFixContent = open(postFixPath, 'r').read()
+
+                if postFixContent.find('tls_server_sni_maps') == -1:
+                    writeToFile = open(postFixPath, 'a')
+                    writeToFile.write('\ntls_server_sni_maps = hash:/etc/postfix/vmail_ssl.map\n')
+                    writeToFile.close()
+
+                postfixMapFile = '/etc/postfix/vmail_ssl.map'
+
+                mapContent = '%s /etc/letsencrypt/live/%s/privkey.pem /etc/letsencrypt/live/%s/fullchain.pem\n' % (childDomain, childDomain, childDomain)
+
+                writeToFile = open(postfixMapFile, 'a')
+                writeToFile.write(mapContent)
                 writeToFile.close()
 
-                command = 'systemctl restart dovecot'
+                command = 'postmap -F hash:/etc/postfix/vmail_ssl.map'
                 ProcessUtilities.executioner(command)
 
-            ### Update postfix configurations
-
-            postFixPath = '/etc/postfix/main.cf'
-
-            postFixContent = open(postFixPath, 'r').read()
-
-            if postFixContent.find('tls_server_sni_maps') == -1:
-                writeToFile = open(postFixPath, 'a')
-                writeToFile.write('\ntls_server_sni_maps = hash:/etc/postfix/vmail_ssl.map\n')
-                writeToFile.close()
-
-            postfixMapFile = '/etc/postfix/vmail_ssl.map'
-
-            mapContent = '%s /etc/letsencrypt/live/%s/privkey.pem /etc/letsencrypt/live/%s/fullchain.pem\n' % (childDomain, childDomain, childDomain)
-
-            writeToFile = open(postfixMapFile, 'a')
-            writeToFile.write(mapContent)
-            writeToFile.close()
-
-            command = 'postmap -F hash:/etc/postfix/vmail_ssl.map'
-            ProcessUtilities.executioner(command)
-
-            command = 'systemctl restart postfix'
-            ProcessUtilities.executioner(command)
+                command = 'systemctl restart postfix'
+                ProcessUtilities.executioner(command)
 
             ###