From c9392bef93f61c0819b5b84e4f452242f3e84147 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Wed, 24 Jan 2024 20:11:15 +0500 Subject: [PATCH] bug fix: set correct soa expire value --- dns/dnsManager.py | 2 +- plogical/cPanelImporter.py | 2 +- plogical/dnsUtilities.py | 4 ++-- plogical/virtualHostUtilities.py | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dns/dnsManager.py b/dns/dnsManager.py index d3b366376..80be93284 100755 --- 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 index 1f39bcc09..49d561368 100644 --- 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 index b07cb6573..c1bbac006 100755 --- 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 index 53d2d9469..679791890 100644 --- 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