bug fix: set correct soa expire value

usmannasir · Jan 24, 2024 · c9392be · c9392be
1 parent 74db3b9
commit c9392be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/dns/dnsManager.py b/dns/dnsManager.py
@@ -136,7 +136,7 @@ def zoneCreation(self, userID = None, data = None):
             newZone = Domains(admin=admin, name=zoneDomain, type="MASTER")
             newZone.save()
 
-            content = "ns1." + zoneDomain + " hostmaster." + zoneDomain + " 1 10800 3600 604800 3600"
+            content = "ns1." + zoneDomain + " hostmaster." + zoneDomain + " 1 10800 3600 1209600 3600"
 
             soaRecord = Records(domainOwner=newZone,
                                 domain_id=newZone.id,

diff --git a/plogical/cPanelImporter.py b/plogical/cPanelImporter.py
@@ -486,7 +486,7 @@ def CreateDNSRecords(self):
                     zone.save()
                     pass
 
-                content = "ns1." + topLevelDomain + " hostmaster." + topLevelDomain + " 1 10800 3600 604800 3600"
+                content = "ns1." + topLevelDomain + " hostmaster." + topLevelDomain + " 1 10800 3600 1209600 3600"
 
                 soaRecord = Records(domainOwner=zone,
                                     domain_id=zone.id,

diff --git a/plogical/dnsUtilities.py b/plogical/dnsUtilities.py
@@ -199,7 +199,7 @@ def dnsTemplate(domain, admin):
                                              auth=1)
                             record.save()
 
-                    content = "ns1." + topLevelDomain + " hostmaster." + topLevelDomain + " 1 10800 3600 604800 3600"
+                    content = "ns1." + topLevelDomain + " hostmaster." + topLevelDomain + " 1 10800 3600 1209600 3600"
 
                     # soaRecord = Records(domainOwner=zone,
                     #                     domain_id=zone.id,
@@ -344,7 +344,7 @@ def dnsTemplate(domain, admin):
 
                     zone.save()
 
-                    content = "ns1." + topLevelDomain + " hostmaster." + topLevelDomain + " 1 10800 3600 604800 3600"
+                    content = "ns1." + topLevelDomain + " hostmaster." + topLevelDomain + " 1 10800 3600 1209600 3600"
 
                     # soaRecord = Records(domainOwner=zone,
                     #                     domain_id=zone.id,

diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py
@@ -362,12 +362,16 @@ def createVirtualHost(virtualHostName, administratorEmail, phpVersion, virtualHo
                     if not os.path.exists(virtualHostUtilities.redisConf):
                         installUtilities.installUtilities.reStartLiteSpeed()
 
+            logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'SSL set up done..,70')
+
             if ssl == 0:
                 if not os.path.exists(virtualHostUtilities.redisConf):
                     installUtilities.installUtilities.reStartLiteSpeed()
 
             vhost.finalizeVhostCreation(virtualHostName, virtualHostUser)
 
+            logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'vHost finalized..,70')
+
             ## Check If Apache is requested
 
             confPath = vhost.Server_root + "/conf/vhosts/" + virtualHostName