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

merge commit

Browse source
This commit is contained in:
robvde 2012-09-27 17:18:41 +04:00
commit d88cca2528
9 changed files with 71 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Data/DataProvider.cs
View file

@ -3414,7 +3414,6 @@ namespace WebsitePanel.EnterpriseServer
public static int GetPackageIdByName(string Name)
{
// get Helicon Zoo provider
int packageId = -1;
List<ProviderInfo> providers = ServerController.GetProviders();
foreach (ProviderInfo providerInfo in providers)
@ -3426,10 +3425,10 @@ namespace WebsitePanel.EnterpriseServer
}
}
if (-1 == packageId)
{
throw new Exception("Provider not found");
}
//if (-1 == packageId)
//{
// throw new Exception("Provider not found");
//}
return packageId;
}

32
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/OperatingSystems/OperatingSystemController.cs
View file

@ -412,17 +412,35 @@ namespace WebsitePanel.EnterpriseServer
public static bool CheckLoadUserProfile(int serverId)
{
int packageId = DataProvider.GetPackageIdByName("IIS70");
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId);
return WebServerController.GetWebServer(serviceId).CheckLoadUserProfile();
int packageId = getIISPackageId();
if (packageId != -1)
{
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId);
return WebServerController.GetWebServer(serviceId).CheckLoadUserProfile();
}
return false;
}
private static int getIISPackageId()
{
int packageId = DataProvider.GetPackageIdByName("IIS80");
if (packageId == -1)
packageId = DataProvider.GetPackageIdByName("IIS70");
if (packageId == -1)
packageId = DataProvider.GetPackageIdByName("IIS60");
return packageId;
}
public static void EnableLoadUserProfile(int serverId)
{
int packageId = DataProvider.GetPackageIdByName("IIS70");
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId);
WebServerController.GetWebServer(serviceId).EnableLoadUserProfile();
int packageId = getIISPackageId();
if (packageId != -1)
{
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId);
WebServerController.GetWebServer(serviceId).EnableLoadUserProfile();
}
}

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

@ -133,6 +133,18 @@ namespace WebsitePanel.EnterpriseServer
if(ip != null)
site.SiteIPAddress = ip.ExternalIP;
// check if site has dedicated IP assigned
var siteIpAddresses = ServerController.GetItemIPAddresses(siteItemId, IPAddressPool.None);
foreach (var siteIp in siteIpAddresses)
{
var packageIpAddress = ServerController.GetPackageIPAddress(siteIp.AddressID);
if (packageIpAddress != null && packageIpAddress.ExternalIP == site.SiteIPAddress)
{
site.IsDedicatedIP = true;
break;
}
}
// truncate home folder
site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath);
@ -681,8 +693,6 @@ namespace WebsitePanel.EnterpriseServer
{
TaskManager.CompleteTask();
}
return 0;
}
public static int SwitchWebSiteToSharedIP(int siteItemId)
@ -744,9 +754,6 @@ namespace WebsitePanel.EnterpriseServer
{
TaskManager.CompleteTask();
}
return 0;
}
private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords,