Updated Hosted Sharepoing Provider (Foundation 2010):
A) Powershell support added within the provider B) Now returns the actual deployed language packs C) The PeoplePicker points to the organization OU and shows only the users from the tentant organization. A requirement when used with Exchange 2010 SP2 Addressbook Policies D) Shared SSL root added to use wild card certificates as part of hosting plan. When enabled the host name is generated. E) Search fix: Provisioning of localhost file where the server component is active. This system expected to be the search server. Within the local hostfile the sites are listed with their local ip address so the search server can resolve the site and crawl through their data. This component needs to be compiled with .NET 2.0 together with Provers.Base, OS.Windows2003, OS.Windows2008, Server.Utils, and Server components. Out standing is to update the build and deployment package for a dedicated deployment packaged so this component is using .NET 2.0, all other should be using .NET 4.0. This will eliminate the configuration circus that was required to get the .NET 4.0 version of this component working previously.
This commit is contained in:
robvde
parent
38592df9e6
commit
a0d9e59db2
25 changed files with 3174 additions and 2256 deletions
|
|
@ -112,11 +112,14 @@
|
|||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="chkLocalHostFile" xml:space="preserve">
|
||||
<value>Provision local hosts file</value>
|
||||
</data>
|
||||
<data name="lblBackupTempFolder.Text" xml:space="preserve">
|
||||
<value>SharePoint Backup Temporary Folder:</value>
|
||||
</data>
|
||||
|
|
@ -126,9 +129,15 @@
|
|||
<data name="lblRootWebApplicationIpAddress.Text" xml:space="preserve">
|
||||
<value>SharePoint Web Application IP:</value>
|
||||
</data>
|
||||
<data name="lblSharedSSLRoot.Text" xml:space="preserve">
|
||||
<value>Shared SSL Root:</value>
|
||||
</data>
|
||||
<data name="lblSharePointBackup.Text" xml:space="preserve">
|
||||
<value>SharePoint Backup</value>
|
||||
</data>
|
||||
<data name="lblWildCardRoot.Text" xml:space="preserve">
|
||||
<value>Wildcard Certificate Root</value>
|
||||
</data>
|
||||
<data name="lclTempBackupNote.Text" xml:space="preserve">
|
||||
<value>Please note that WebsitePanel Server account should have access to this folder. Leave this field blank to use default path.</value>
|
||||
</data>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,21 @@
|
|||
<td width="100%">
|
||||
<wsp:SelectIPAddress ID="ddlRootWebApplicationIpAddress" runat="server" ServerIdParam="ServerID" AllowEmptySelection="false" />
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<asp:CheckBox ID="chkLocalHostFile" runat="server" meta:resourcekey="chkLocalHostFile" Text="Provision localhost file" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap>
|
||||
<asp:Label ID="lblSharedSSLRoot" runat="server" meta:resourcekey="lblSharedSSLRoot" Text="Shared SSL Root:"></asp:Label>
|
||||
</td>
|
||||
<td width="100%">
|
||||
<asp:TextBox ID="txtSharedSSLRoot" runat="server" CssClass="NormalTextBox" Width="200px"></asp:TextBox>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
<fieldset>
|
||||
|
|
@ -39,4 +53,5 @@
|
|||
|
||||
</table>
|
||||
</fieldset>
|
||||
|
||||
<br />
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2012, Outercurve Foundation.
|
||||
// Copyright (c) 2011, Outercurve Foundation.
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
|
|
@ -41,54 +41,61 @@ using WebsitePanel.EnterpriseServer;
|
|||
|
||||
namespace WebsitePanel.Portal.ProviderControls
|
||||
{
|
||||
public partial class HostedSharePoint30_Settings : WebsitePanelControlBase, IHostingServiceProviderSettings
|
||||
{
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
public partial class HostedSharePoint30_Settings : WebsitePanelControlBase, IHostingServiceProviderSettings
|
||||
{
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public void BindSettings(StringDictionary settings)
|
||||
{
|
||||
this.txtRootWebApplication.Text = settings["RootWebApplicationUri"];
|
||||
int selectedAddressid = this.FindAddressByText(settings["RootWebApplicationIpAddress"]);
|
||||
this.ddlRootWebApplicationIpAddress.AddressId = (selectedAddressid > 0) ? selectedAddressid : 0;
|
||||
txtBackupTempFolder.Text = settings["BackupTemporaryFolder"];
|
||||
}
|
||||
public void BindSettings(StringDictionary settings)
|
||||
{
|
||||
this.txtRootWebApplication.Text = settings["RootWebApplicationUri"];
|
||||
int selectedAddressid = this.FindAddressByText(settings["RootWebApplicationIpAddress"]);
|
||||
this.ddlRootWebApplicationIpAddress.AddressId = (selectedAddressid > 0) ? selectedAddressid : 0;
|
||||
chkLocalHostFile.Checked = Utils.ParseBool(settings["LocalHostFile"], false);
|
||||
this.txtSharedSSLRoot.Text = settings["SharedSSLRoot"];
|
||||
}
|
||||
|
||||
public void SaveSettings(StringDictionary settings)
|
||||
{
|
||||
settings["RootWebApplicationUri"] = this.txtRootWebApplication.Text;
|
||||
public void SaveSettings(StringDictionary settings)
|
||||
{
|
||||
settings["RootWebApplicationUri"] = this.txtRootWebApplication.Text;
|
||||
settings["LocalHostFile"] = chkLocalHostFile.Checked.ToString();
|
||||
settings["RootWebApplicationInteralIpAddress"] = String.Empty;
|
||||
settings["SharedSSLRoot"] = this.txtSharedSSLRoot.Text;
|
||||
|
||||
if (ddlRootWebApplicationIpAddress.AddressId > 0)
|
||||
{
|
||||
IPAddressInfo address = ES.Services.Servers.GetIPAddress(ddlRootWebApplicationIpAddress.AddressId);
|
||||
if (ddlRootWebApplicationIpAddress.AddressId > 0)
|
||||
{
|
||||
IPAddressInfo address = ES.Services.Servers.GetIPAddress(ddlRootWebApplicationIpAddress.AddressId);
|
||||
if (String.IsNullOrEmpty(address.ExternalIP))
|
||||
{
|
||||
{
|
||||
settings["RootWebApplicationIpAddress"] = address.InternalIP;
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
settings["RootWebApplicationIpAddress"] = address.ExternalIP;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
settings["RootWebApplicationIpAddress"] = String.Empty;
|
||||
}
|
||||
settings["BackupTemporaryFolder"] = txtBackupTempFolder.Text;
|
||||
}
|
||||
}
|
||||
|
||||
private int FindAddressByText(string address)
|
||||
{
|
||||
foreach (IPAddressInfo addressInfo in ES.Services.Servers.GetIPAddresses(IPAddressPool.General, PanelRequest.ServerId))
|
||||
{
|
||||
if (addressInfo.InternalIP == address || addressInfo.ExternalIP == address)
|
||||
{
|
||||
return addressInfo.AddressId;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (!String.IsNullOrEmpty(address.InternalIP))
|
||||
settings["RootWebApplicationInteralIpAddress"] = address.InternalIP;
|
||||
}
|
||||
else
|
||||
{
|
||||
settings["RootWebApplicationIpAddress"] = String.Empty;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private int FindAddressByText(string address)
|
||||
{
|
||||
foreach (IPAddressInfo addressInfo in ES.Services.Servers.GetIPAddresses(IPAddressPool.General, PanelRequest.ServerId))
|
||||
{
|
||||
if (addressInfo.InternalIP == address || addressInfo.ExternalIP == address)
|
||||
{
|
||||
return addressInfo.AddressId;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.1434
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -49,6 +48,33 @@ namespace WebsitePanel.Portal.ProviderControls {
|
|||
/// </remarks>
|
||||
protected global::WebsitePanel.Portal.SelectIPAddress ddlRootWebApplicationIpAddress;
|
||||
|
||||
/// <summary>
|
||||
/// chkLocalHostFile control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.CheckBox chkLocalHostFile;
|
||||
|
||||
/// <summary>
|
||||
/// lblSharedSSLRoot control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblSharedSSLRoot;
|
||||
|
||||
/// <summary>
|
||||
/// txtSharedSSLRoot control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtSharedSSLRoot;
|
||||
|
||||
/// <summary>
|
||||
/// lblSharePointBackup control.
|
||||
/// </summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue