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

Fixed: Upon migration ensured that Domain and Pointers are configured as

Browse source 
required for the new version. The website pointer added as a dedicated record.
The domain alias made visible as a top-level or sub-domain.

Fixed duplicate pointers when reconstructing pointers for legacy sites.

Legacy sites do not have all their hostheaders stored within the domains table
This commit is contained in:
robvde 2012-10-11 13:57:54 +04:00
parent 18dd0d9096
commit 6795a0feb1
2 changed files with 63 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

52
WebsitePanel/Database/update_db.sql
View file

@ -5853,3 +5853,55 @@ WHERE
RETURN' RETURN'
END END
GO GO
BEGIN TRAN
CREATE TABLE #TempDomains
(
[PackageID] [int] NOT NULL,
[ZoneItemID] [int] NULL,
[DomainName] [nvarchar](100) COLLATE Latin1_General_CI_AS NOT NULL,
[HostingAllowed] [bit] NOT NULL,
[WebSiteID] [int] NULL,
[IsSubDomain] [bit] NOT NULL,
[IsInstantAlias] [bit] NOT NULL,
[IsDomainPointer] [bit] NOT NULL,
)
INSERT INTO #TempDomains SELECT PackageID,
ZoneItemID,
DomainName,
HostingAllowed,
WebSiteID,
IsSubDomain,
IsInstantAlias,
IsDomainPointer FROM Domains WHERE IsDomainPointer = 1
UPDATE Domains SET IsDomainPointer=0,WebSiteID=NULL WHERE IsDomainPointer = 1 AND DomainName IN (SELECT DomainName FROM Domains AS D WHERE
D.DomainName = (SELECT DISTINCT ItemName FROM ServiceItems WHERE ItemID = D.ZoneItemId )
Group BY DOmainName
HAVING (COUNT(DomainName) = 1))
INSERT INTO Domains SELECT PackageID,
ZoneItemID,
DomainName,
HostingAllowed,
WebSiteID,
NULL,
IsSubDomain,
IsInstantAlias,
IsDomainPointer
FROM #TempDomains As T WHERE DomainName IN (SELECT DomainName FROM Domains AS D WHERE
D.DomainName = (SELECT DISTINCT ItemName FROM ServiceItems WHERE ItemID = D.ZoneItemId )
Group BY DOmainName
HAVING (COUNT(DomainName) = 1))
DROP TABLE #TempDomains
COMMIT TRAN
GO

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

@ -1143,13 +1143,18 @@ namespace WebsitePanel.EnterpriseServer
if (!string.IsNullOrEmpty(b.Host)) if (!string.IsNullOrEmpty(b.Host))
{ {
domain.DomainName = b.Host; domain.DomainName = b.Host;
int domainID = ServerController.AddDomain(domain, domain.IsInstantAlias, false);
DomainInfo domainTmp = ServerController.GetDomain(domainID); DomainInfo domainTmp = ServerController.GetDomain(domain.DomainName);
if (domainTmp != null) if (!((domainTmp != null) && (domainTmp.WebSiteId == siteItemId)))
{ {
domainTmp.WebSiteId = siteItemId; int domainID = ServerController.AddDomain(domain, domain.IsInstantAlias, false);
domainTmp.ZoneItemId = domain.ZoneItemId; domainTmp = ServerController.GetDomain(domainID);
ServerController.UpdateDomain(domainTmp); if (domainTmp != null)
{
domainTmp.WebSiteId = siteItemId;
domainTmp.ZoneItemId = domain.ZoneItemId;
ServerController.UpdateDomain(domainTmp);
}
} }
} }
} }