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

4
WebsitePanel/Database/install_db.sql
View file

@ -23621,11 +23621,11 @@ INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName]
GO GO
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (63, 4, N'hMailServer5', N'hMailServer 5.x', N'WebsitePanel.Providers.Mail.hMailServer5, WebsitePanel.Providers.Mail.hMailServer5', N'hMailServer5', NULL) INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (63, 4, N'hMailServer5', N'hMailServer 5.x', N'WebsitePanel.Providers.Mail.hMailServer5, WebsitePanel.Providers.Mail.hMailServer5', N'hMailServer5', NULL)
GO GO
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (64, 4, N'SmarterMail', N'SmarterMail 7.x', N'WebsitePanel.Providers.Mail.SmarterMail7, WebsitePanel.Providers.Mail.SmarterMail7', N'SmarterMail60', NULL) INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (64, 4, N'SmarterMail', N'SmarterMail 7.x - 8.x', N'WebsitePanel.Providers.Mail.SmarterMail7, WebsitePanel.Providers.Mail.SmarterMail7', N'SmarterMail60', NULL)
GO GO
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (65, 4, N'SmarterMail', N'SmarterMail 9.x', N'WebsitePanel.Providers.Mail.SmarterMail9, WebsitePanel.Providers.Mail.SmarterMail9', N'SmarterMail60', NULL) INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (65, 4, N'SmarterMail', N'SmarterMail 9.x', N'WebsitePanel.Providers.Mail.SmarterMail9, WebsitePanel.Providers.Mail.SmarterMail9', N'SmarterMail60', NULL)
GO GO
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (66, 4, N'SmarterMail', N'SmarterMail 10.x', N'WebsitePanel.Providers.Mail.SmarterMail10, WebsitePanel.Providers.Mail.SmarterMail10', N'SmarterMail60', NULL) INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (66, 4, N'SmarterMail', N'SmarterMail 10.x +', N'WebsitePanel.Providers.Mail.SmarterMail10, WebsitePanel.Providers.Mail.SmarterMail10', N'SmarterMail60', NULL)
GO GO
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (100, 1, N'Windows2008', N'Windows Server 2008', N'WebsitePanel.Providers.OS.Windows2008, WebsitePanel.Providers.OS.Windows2008', N'Windows2008', NULL) INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (100, 1, N'Windows2008', N'Windows Server 2008', N'WebsitePanel.Providers.OS.Windows2008, WebsitePanel.Providers.OS.Windows2008', N'Windows2008', NULL)
GO GO

4
WebsitePanel/Database/update_db.sql
View file

@ -4863,6 +4863,10 @@ BEGIN
INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (66, N'ServiceUrl', N'http://localhost:9998/services/') INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (66, N'ServiceUrl', N'http://localhost:9998/services/')
END END
GO GO
UPDATE [dbo].[Providers] SET [DisplayName] = 'SmarterMail 7.x - 8.x' WHERE [DisplayName] = 'SmarterMail 7.x'
GO
UPDATE [dbo].[Providers] SET [DisplayName] = 'SmarterMail 10.x +' WHERE [DisplayName] = 'SmarterMail 10.x'
GO
ALTER PROCEDURE [dbo].[AddServiceItem] ALTER PROCEDURE [dbo].[AddServiceItem]

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

@ -3414,7 +3414,6 @@ namespace WebsitePanel.EnterpriseServer
public static int GetPackageIdByName(string Name) public static int GetPackageIdByName(string Name)
{ {
// get Helicon Zoo provider
int packageId = -1; int packageId = -1;
List<ProviderInfo> providers = ServerController.GetProviders(); List<ProviderInfo> providers = ServerController.GetProviders();
foreach (ProviderInfo providerInfo in providers) foreach (ProviderInfo providerInfo in providers)
@ -3426,10 +3425,10 @@ namespace WebsitePanel.EnterpriseServer
} }
} }
if (-1 == packageId) //if (-1 == packageId)
{ //{
throw new Exception("Provider not found"); // throw new Exception("Provider not found");
} //}
return packageId; 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) public static bool CheckLoadUserProfile(int serverId)
{ {
int packageId = DataProvider.GetPackageIdByName("IIS70"); int packageId = getIISPackageId();
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId); if (packageId != -1)
return WebServerController.GetWebServer(serviceId).CheckLoadUserProfile(); {
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) public static void EnableLoadUserProfile(int serverId)
{ {
int packageId = DataProvider.GetPackageIdByName("IIS70"); int packageId = getIISPackageId();
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId); if (packageId != -1)
WebServerController.GetWebServer(serviceId).EnableLoadUserProfile(); {
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) if(ip != null)
site.SiteIPAddress = ip.ExternalIP; 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 // truncate home folder
site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath); site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath);
@ -681,8 +693,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return 0;
} }
public static int SwitchWebSiteToSharedIP(int siteItemId) public static int SwitchWebSiteToSharedIP(int siteItemId)
@ -744,9 +754,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return 0;
} }
private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords, private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords,

7
WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebSite.cs
View file

@ -47,6 +47,7 @@ namespace WebsitePanel.Providers.Web
private string siteId; private string siteId;
private string siteIPAddress; private string siteIPAddress;
private int siteIPAddressId; private int siteIPAddressId;
private bool isDedicatedIP;
private string dataPath; private string dataPath;
private ServerBinding[] bindings; private ServerBinding[] bindings;
private bool frontPageAvailable; private bool frontPageAvailable;
@ -85,6 +86,12 @@ namespace WebsitePanel.Providers.Web
set { siteIPAddressId = value; } set { siteIPAddressId = value; }
} }
public bool IsDedicatedIP
{
get { return isDedicatedIP; }
set { isDedicatedIP = value; }
}
/// <summary> /// <summary>
/// Gets or sets logs path for the web site /// Gets or sets logs path for the web site
/// </summary> /// </summary>

4
WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail7/SmarterMail7.cs
View file

@ -2107,7 +2107,7 @@ namespace WebsitePanel.Providers.Mail
if (!String.IsNullOrEmpty(productVersion)) if (!String.IsNullOrEmpty(productVersion))
{ {
string[] split = productVersion.Split(new char[] { '.' }); string[] split = productVersion.Split(new char[] { '.' });
return split[0].Equals("7"); return split[0].Equals("7")||split[0].Equals("8");
} }
} }
@ -2140,7 +2140,7 @@ namespace WebsitePanel.Providers.Mail
if (!String.IsNullOrEmpty(productVersion)) if (!String.IsNullOrEmpty(productVersion))
{ {
string[] split = productVersion.Split(new[] { '.' }); string[] split = productVersion.Split(new[] { '.' });
return split[0].Equals("7"); return split[0].Equals("7")||split[0].Equals("8");
} }
return false; return false;

14
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
View file

@ -4046,7 +4046,12 @@ namespace WebsitePanel.Providers.Web
{ {
using (var srvman = new ServerManager()) using (var srvman = new ServerManager())
{ {
return srvman.ApplicationPools["WebsitePanel Server"].ProcessModel.LoadUserProfile; string poolName = Environment.GetEnvironmentVariable("APP_POOL_ID", EnvironmentVariableTarget.Process);
ApplicationPool pool = srvman.ApplicationPools[poolName];
if (pool == null)
throw new Exception("ApplicationPool pool is null" + poolName);
return pool.ProcessModel.LoadUserProfile;
} }
} }
@ -4055,7 +4060,12 @@ namespace WebsitePanel.Providers.Web
{ {
using (var srvman = new ServerManager()) using (var srvman = new ServerManager())
{ {
srvman.ApplicationPools["WebsitePanel Server"].ProcessModel.LoadUserProfile = true; string poolName = Environment.GetEnvironmentVariable("APP_POOL_ID", EnvironmentVariableTarget.Process);
ApplicationPool pool = srvman.ApplicationPools[poolName];
if (pool == null)
throw new Exception("ApplicationPool pool is null" + poolName);
pool.ProcessModel.LoadUserProfile = true;
// save changes // save changes
srvman.CommitChanges(); srvman.CommitChanges();
} }

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
View file

@ -176,15 +176,13 @@ namespace WebsitePanel.Portal
ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString())); ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString()));
} }
bool isDedicatedIP = false; if (site.IsDedicatedIP)
if (!String.IsNullOrEmpty(site.SiteIPAddress))
{ {
litIPAddress.Text = site.SiteIPAddress; litIPAddress.Text = site.SiteIPAddress;
isDedicatedIP = true;
} }
dedicatedIP.Visible = isDedicatedIP; dedicatedIP.Visible = site.IsDedicatedIP;
sharedIP.Visible = !isDedicatedIP; sharedIP.Visible = !site.IsDedicatedIP;
cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0); cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0);