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

Fixed: Domains update routine to get aligned with 2.0

Browse source
This commit is contained in:
robvde 2012-10-22 23:36:03 +04:00
parent 83220532db
commit 2907c27592
2 changed files with 55 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

51
WebsitePanel/Database/update_db.sql
View file

@ -5858,33 +5858,15 @@ GO
IF NOT EXISTS(select 1 from sys.columns COLS INNER JOIN sys.objects OBJS ON OBJS.object_id=COLS.object_id and OBJS.type='U' AND OBJS.name='Domains' AND COLS.name='DomainItemId') IF NOT EXISTS(select 1 from sys.columns COLS INNER JOIN sys.objects OBJS ON OBJS.object_id=COLS.object_id and OBJS.type='U' AND OBJS.name='Domains' AND COLS.name='DomainItemId')
BEGIN BEGIN
ALTER TABLE [dbo].[Domains] ADD ALTER TABLE [dbo].[Domains] ADD [DomainItemId] [int] NULL
[DomainItemId] [int] NULL
END END
GO GO
IF (SELECT Count(*) FROM Domains WHERE DomainItemId IS NOT NULL) = 0
BEGIN
BEGIN TRAN
CREATE TABLE #TempDomains CREATE TABLE #TempDomains
( (
[PackageID] [int] NOT NULL, [PackageID] [int] NOT NULL,
@ -5898,7 +5880,7 @@ CREATE TABLE #TempDomains
[DomainItemID] [int] NULL, [DomainItemID] [int] NULL,
) )
UPDATE Domains SET DomainItemID = DomainID WHERE DomainItemID IS NULL UPDATE Domains SET DomainItemID = DomainID
INSERT INTO #TempDomains SELECT PackageID, INSERT INTO #TempDomains SELECT PackageID,
ZoneItemID, ZoneItemID,
@ -5908,15 +5890,9 @@ WebSiteID,
IsSubDomain, IsSubDomain,
IsInstantAlias, IsInstantAlias,
IsDomainPointer, IsDomainPointer,
DomainItemID FROM Domains WHERE IsDomainPointer = 1 DomainItemID FROM Domains WHERE WebSiteID IS NOT NULL
UPDATE Domains SET IsDomainPointer=0,WebSiteID=NULL, DomainItemID=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 )
AND DomainItemID IS NULL
Group BY DOmainName
HAVING (COUNT(DomainName) = 1))
UPDATE Domains SET IsDomainPointer=0,WebSiteID=NULL, DomainItemID=NULL WHERE WebSiteID IS NOT NULL
INSERT INTO Domains SELECT PackageID, INSERT INTO Domains SELECT PackageID,
ZoneItemID, ZoneItemID,
@ -5924,20 +5900,15 @@ DomainName,
HostingAllowed, HostingAllowed,
WebSiteID, WebSiteID,
NULL, NULL,
IsSubDomain, 0,
IsInstantAlias, IsInstantAlias,
IsDomainPointer, 1,
DomainItemID DomainItemID
FROM #TempDomains As T WHERE DomainName IN (SELECT DomainName FROM Domains AS D WHERE FROM #TempDomains
D.DomainName = (SELECT DISTINCT ItemName FROM ServiceItems WHERE ItemID = D.ZoneItemId )
Group BY DOmainName
HAVING (COUNT(DomainName) = 1))
UPDATE Domains SET DomainItemID = null WHERE IsDomainPointer=0
DROP TABLE #TempDomains DROP TABLE #TempDomains
COMMIT TRAN END
GO GO

14
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
View file

@ -5,11 +5,19 @@
</configSections> </configSections>
<!-- Connection strings --> <!-- Connection strings -->
<connectionStrings> <connectionStrings>
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" /> <!--
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
-->
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- Encryption util settings --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.CryptoKey" value="1234567890" /> <!--
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-->
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true" /> <add key="WebsitePanel.EncryptionEnabled" value="true" />
<!-- Web Applications --> <!-- Web Applications -->