Merge
This commit is contained in:
commit
e61bce879a
10 changed files with 45 additions and 21 deletions
|
@ -31,7 +31,7 @@ namespace WebsitePanel.Setup
|
|||
{
|
||||
return UpdateBase(obj,
|
||||
minimalInstallerVersion: "2.0.0",
|
||||
versionToUpgrade: "1.2.1",
|
||||
versionToUpgrade: "1.2.1,2.0.0",
|
||||
updateSql: true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ namespace WebsitePanel.Setup
|
|||
{
|
||||
return UpdateBase(obj,
|
||||
minimalInstallerVersion: "2.0.0",
|
||||
versionsToUpgrade: "1.2.1",
|
||||
versionsToUpgrade: "1.2.1,2.0.0",
|
||||
updateSql: false,
|
||||
versionSpecificAction: new InstallAction(ActionTypes.ConfigureSecureSessionModuleInWebConfig));
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace WebsitePanel.Setup
|
|||
{
|
||||
return Server.UpdateBase(obj,
|
||||
minimalInstallerVersion: "2.0.0",
|
||||
versionToUpgrade: "1.2.1",
|
||||
versionToUpgrade: "1.2.1,2.0.0",
|
||||
updateSql: false);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -325,13 +325,17 @@ namespace WebsitePanel.Setup
|
|||
|
||||
if (webServer != null)
|
||||
{
|
||||
var modules = doc.CreateElement(iis6 ? "httpModules" : "modules");
|
||||
string modulesNodeName = iis6 ? "httpModules" : "modules";
|
||||
if (webServer.SelectSingleNode(modulesNodeName + "/add[@name='SecureSession']") == null)
|
||||
{
|
||||
var modules = doc.CreateElement(modulesNodeName);
|
||||
webServer.AppendChild(modules);
|
||||
var sessionModule = doc.CreateElement("add");
|
||||
sessionModule.SetAttribute("name", "SecureSession");
|
||||
sessionModule.SetAttribute("type", "WebsitePanel.WebPortal.SecureSessionModule");
|
||||
modules.AppendChild(sessionModule);
|
||||
}
|
||||
}
|
||||
|
||||
// update /system.web/httpRuntime element
|
||||
var httpRuntime = doc.SelectSingleNode("configuration/system.web/httpRuntime") as XmlElement;
|
||||
|
@ -343,7 +347,7 @@ namespace WebsitePanel.Setup
|
|||
// <add key="SessionValidationKey" value="XXXXXX" />
|
||||
//</appSettings>
|
||||
var appSettings = doc.SelectSingleNode("configuration/appSettings");
|
||||
if (appSettings != null)
|
||||
if (appSettings != null && appSettings.SelectSingleNode("add[@key='SessionValidationKey']") == null)
|
||||
{
|
||||
var sessionKey = doc.CreateElement("add");
|
||||
sessionKey.SetAttribute("key", "SessionValidationKey");
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
@ -654,8 +666,6 @@ namespace WebsitePanel.EnterpriseServer
|
|||
{
|
||||
TaskManager.CompleteTask();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static int SwitchWebSiteToSharedIP(int siteItemId)
|
||||
|
@ -717,9 +727,6 @@ namespace WebsitePanel.EnterpriseServer
|
|||
{
|
||||
TaskManager.CompleteTask();
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords,
|
||||
|
|
|
@ -47,6 +47,7 @@ namespace WebsitePanel.Providers.Web
|
|||
private string siteId;
|
||||
private string siteIPAddress;
|
||||
private int siteIPAddressId;
|
||||
private bool isDedicatedIP;
|
||||
private string dataPath;
|
||||
private ServerBinding[] bindings;
|
||||
private bool frontPageAvailable;
|
||||
|
@ -85,6 +86,12 @@ namespace WebsitePanel.Providers.Web
|
|||
set { siteIPAddressId = value; }
|
||||
}
|
||||
|
||||
public bool IsDedicatedIP
|
||||
{
|
||||
get { return isDedicatedIP; }
|
||||
set { isDedicatedIP = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets logs path for the web site
|
||||
/// </summary>
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
<asp:Label ID="lblSubscriberNumber" runat="server" meta:resourcekey="lblSubscriberNumber" Text="Account Number:"></asp:Label>
|
||||
</td>
|
||||
<td class="NormalBold">
|
||||
<asp:TextBox id="txtSubscriberNumber" runat="server" CssClass="NormalTextBox"></asp:TextBox>
|
||||
<asp:TextBox id="txtSubscriberNumber" runat="server" CssClass="NormalTextBox" ></asp:TextBox>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
|
@ -43,6 +43,13 @@ namespace WebsitePanel.Portal
|
|||
|
||||
if (PortalUtils.GetHideDemoCheckbox()) rowDemo.Visible = false;
|
||||
}
|
||||
|
||||
if (PanelSecurity.LoggedUser.Role == UserRole.User)
|
||||
{
|
||||
txtSubscriberNumber.ReadOnly = true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void BindUser()
|
||||
|
|
|
@ -176,15 +176,13 @@ namespace WebsitePanel.Portal
|
|||
ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString()));
|
||||
}
|
||||
|
||||
bool isDedicatedIP = false;
|
||||
if (!String.IsNullOrEmpty(site.SiteIPAddress))
|
||||
if (site.IsDedicatedIP)
|
||||
{
|
||||
litIPAddress.Text = site.SiteIPAddress;
|
||||
isDedicatedIP = true;
|
||||
}
|
||||
|
||||
dedicatedIP.Visible = isDedicatedIP;
|
||||
sharedIP.Visible = !isDedicatedIP;
|
||||
dedicatedIP.Visible = site.IsDedicatedIP;
|
||||
sharedIP.Visible = !site.IsDedicatedIP;
|
||||
cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0);
|
||||
|
||||
|
||||
|
|
|
@ -571,6 +571,7 @@
|
|||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit-$(Version).msi" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanelInstaller.msi" RemoteFiles="WebsitePanelInstaller-$(Version).msi" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\Manual-Update.zip" RemoteFiles="Manual-Update-$(Version).zip" />
|
||||
</Target>
|
||||
|
||||
<Target Name="uploadtocodeplex">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue