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

Fixed Web Shared/Dedicated switch when no global dns records are defined

Browse source
This commit is contained in:
robvde 2012-09-28 13:12:12 +04:00
parent c90b613039
commit 04c4d5a189
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -639,6 +639,13 @@ namespace WebsitePanel.EnterpriseServer
if (domain != null) if (domain != null)
DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false);
// clear binding left overs
WebServer web = new WebServer();
ServiceProviderProxy.Init(web, siteItem.ServiceId);
WebSite site = web.GetSite(siteItem.SiteId);
List<ServerBinding> newBindings = new List<ServerBinding>();
web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
// update site item // update site item
siteItem.SiteIPAddressId = addressId; siteItem.SiteIPAddressId = addressId;
PackageController.UpdatePackageItem(siteItem); PackageController.UpdatePackageItem(siteItem);
@ -661,23 +668,18 @@ namespace WebsitePanel.EnterpriseServer
, ZoneInfo.DomainId, true, true, true); , ZoneInfo.DomainId, true, true, true);
} }
WebServer web = new WebServer();
ServiceProviderProxy.Init(web, siteItem.ServiceId);
WebSite site = web.GetSite(siteItem.SiteId);
// load web site IP address // load web site IP address
IPAddressInfo ip = ServerController.GetIPAddress(siteItem.SiteIPAddressId); IPAddressInfo ip = ServerController.GetIPAddress(siteItem.SiteIPAddressId);
string ipAddr = "*"; string ipAddr = "*";
if (ip != null) if (ip != null)
ipAddr = !String.IsNullOrEmpty(ip.InternalIP) ? ip.InternalIP : ip.ExternalIP; ipAddr = !String.IsNullOrEmpty(ip.InternalIP) ? ip.InternalIP : ip.ExternalIP;
List<ServerBinding> newBindings = new List<ServerBinding>(); newBindings = new List<ServerBinding>();
ServerBinding srvBinding = new ServerBinding(ipAddr, "80", ""); ServerBinding srvBinding = new ServerBinding(ipAddr, "80", "");
newBindings.Add(srvBinding); newBindings.Add(srvBinding);
foreach (ServerBinding b in site.Bindings) foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId))
{ {
if (!((b.Host == srvBinding.Host) & if (!((b.Host == srvBinding.Host) &
(b.IP == srvBinding.IP) & (b.IP == srvBinding.IP) &