merge commit
This commit is contained in:
commit
8edcd5aeb8
6 changed files with 20 additions and 3 deletions
|
@ -514,6 +514,10 @@ namespace WebsitePanel.Setup.Actions
|
||||||
{
|
{
|
||||||
serviceInfo.ProviderId = 209;
|
serviceInfo.ProviderId = 209;
|
||||||
}
|
}
|
||||||
|
else if (sqlVersion.StartsWith("12."))
|
||||||
|
{
|
||||||
|
serviceInfo.ProviderId = 1203;
|
||||||
|
}
|
||||||
serviceId = ES.Services.Servers.AddService(serviceInfo);
|
serviceId = ES.Services.Servers.AddService(serviceInfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -124,11 +124,11 @@ namespace WebsitePanel.Setup
|
||||||
{
|
{
|
||||||
// check SQL server version
|
// check SQL server version
|
||||||
string sqlVersion = GetSqlServerVersion(connectionString);
|
string sqlVersion = GetSqlServerVersion(connectionString);
|
||||||
if (!sqlVersion.StartsWith("9.") && !sqlVersion.StartsWith("10.") && !sqlVersion.StartsWith("11."))
|
if (!sqlVersion.StartsWith("9.") && !sqlVersion.StartsWith("10.") && !sqlVersion.StartsWith("11.") && !sqlVersion.StartsWith("12."))
|
||||||
{
|
{
|
||||||
// SQL Server 2005 engine required
|
// SQL Server 2005 engine required
|
||||||
e.Cancel = true;
|
e.Cancel = true;
|
||||||
ShowWarning("This program can be installed on SQL Server 2005/2008/2012 only.");
|
ShowWarning("This program can be installed on SQL Server 2005/2008/2012/2014 only.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int securityMode = GetSqlServerSecurityMode(connectionString);
|
int securityMode = GetSqlServerSecurityMode(connectionString);
|
||||||
|
|
|
@ -954,6 +954,10 @@ namespace WebsitePanel.Setup
|
||||||
{
|
{
|
||||||
serviceInfo.ProviderId = 209;
|
serviceInfo.ProviderId = 209;
|
||||||
}
|
}
|
||||||
|
else if (sqlVersion.StartsWith("12."))
|
||||||
|
{
|
||||||
|
serviceInfo.ProviderId = 1203;
|
||||||
|
}
|
||||||
serviceId = ES.Services.Servers.AddService(serviceInfo);
|
serviceId = ES.Services.Servers.AddService(serviceInfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -4696,6 +4696,10 @@ namespace WebsitePanel.Providers.HostedSolution
|
||||||
ExchangeLog.LogWarning("Attemp {0} to update mail public folder {1}", attempts, folder);
|
ExchangeLog.LogWarning("Attemp {0} to update mail public folder {1}", attempts, folder);
|
||||||
System.Threading.Thread.Sleep(5000);
|
System.Threading.Thread.Sleep(5000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// exchange transport needs access to create new items in order to deliver email
|
||||||
|
AddPublicFolderClientPermission(runSpace, folder, "Anonymous", "CreateItems");
|
||||||
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
|
|
@ -90,6 +90,11 @@ namespace WebsitePanel.Portal.ProviderControls
|
||||||
|
|
||||||
private int FindAddressByText(string address)
|
private int FindAddressByText(string address)
|
||||||
{
|
{
|
||||||
|
if (string.IsNullOrEmpty(address))
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (IPAddressInfo addressInfo in ES.Services.Servers.GetIPAddresses(IPAddressPool.General, PanelRequest.ServerId))
|
foreach (IPAddressInfo addressInfo in ES.Services.Servers.GetIPAddresses(IPAddressPool.General, PanelRequest.ServerId))
|
||||||
{
|
{
|
||||||
if (addressInfo.InternalIP == address || addressInfo.ExternalIP == address)
|
if (addressInfo.InternalIP == address || addressInfo.ExternalIP == address)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue