zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed

Browse source 
1.	Remove the text on the Create a website tab that says “ignore” really can just delete whole line
2.	Database records for SSL need to be deleted from database when switching from Static to Dynamic (If you make a cert request, switch and switch again it shows the prior request. It should be defaulted again)
3.	Instant alias should ignore global dns rules
This commit is contained in:
robvde 2012-10-04 09:40:21 +04:00
parent d28dc2f1d8
commit aa11b4b202
5 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/DnsServers/DnsServerController.cs
View file

@ -47,10 +47,10 @@ namespace WebsitePanel.EnterpriseServer
public static int AddZone(int packageId, int serviceId, string zoneName)
{
return AddZone(packageId, serviceId, zoneName, true);
return AddZone(packageId, serviceId, zoneName, true, false);
}
public static int AddZone(int packageId, int serviceId, string zoneName, bool addPackageItem)
public static int AddZone(int packageId, int serviceId, string zoneName, bool addPackageItem, bool ignoreGlobalDNSRecords)
{
// get DNS provider
DNSServer dns = GetDNSServer(serviceId);
@ -148,13 +148,17 @@ namespace WebsitePanel.EnterpriseServer
zoneRecords.Add(ns);
}
// add all other records
zoneRecords.AddRange(BuildDnsResourceRecords(records, "", zoneName, ""));
if (!ignoreGlobalDNSRecords)
{
// add all other records
zoneRecords.AddRange(BuildDnsResourceRecords(records, "", zoneName, ""));
}
// add zone records
dns.AddZoneRecords(zoneName, zoneRecords.ToArray());
// add secondary zones
foreach (int secondaryId in secondaryServiceIds)
{
@ -443,7 +447,7 @@ namespace WebsitePanel.EnterpriseServer
if (!dns.ZoneExists(itemName))
{
// create primary and secondary zones
AddZone(packageId, serviceId, itemName, false);
AddZone(packageId, serviceId, itemName, false, false);
// restore records
XmlSerializer serializer = new XmlSerializer(typeof(DnsRecord));

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
View file

@ -1852,7 +1852,7 @@ namespace WebsitePanel.EnterpriseServer
int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.Dns);
if (serviceId > 0)
{
zoneItemId = DnsServerController.AddZone(packageId, serviceId, domainName);
zoneItemId = DnsServerController.AddZone(packageId, serviceId, domainName, true, isInstantAlias);
}
if (zoneItemId < 0)

10
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
View file

@ -642,7 +642,15 @@ namespace WebsitePanel.EnterpriseServer
DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName);
if (ZoneInfo == null)
throw new Exception("failed to retrieve parent zone");
throw new Exception("Parent zone not found");
//cleanup certificates
List<SSLCertificate> certificates = GetCertificatesForSite(siteItemId);
foreach (SSLCertificate c in certificates)
{
DeleteCertificate(siteItemId, c);
}
List<DomainInfo> pointers = GetWebSitePointers(siteItemId);
foreach (DomainInfo pointer in pointers)