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

merge commit

Browse source 
Fixed: Simple Url configuration for Lync, refactored
This commit is contained in:
robvde 2012-10-21 18:40:08 +04:00
parent 18bd22dc1c
commit b8c6bc50e4
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
View file

@ -5,11 +5,19 @@
</configSections> </configSections>
<!-- Connection strings --> <!-- Connection strings -->
<connectionStrings> <connectionStrings>
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" /> <!--
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
-->
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- Encryption util settings --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.CryptoKey" value="1234567890" /> <!--
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-->
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true" /> <add key="WebsitePanel.EncryptionEnabled" value="true" />
<!-- Web Applications --> <!-- Web Applications -->
@ -18,8 +26,7 @@
<!-- Maximum waiting time when sending request to the remote server <!-- Maximum waiting time when sending request to the remote server
The value is in seconds. "-1" - infinite. --> The value is in seconds. "-1" - infinite. -->
<add key="WebsitePanel.EnterpriseServer.ServerRequestTimeout" value="3600" /> <add key="WebsitePanel.EnterpriseServer.ServerRequestTimeout" value="3600" />
</appSettings> </appSettings> <system.web>
<system.web>
<!-- Disable any authentication --> <!-- Disable any authentication -->
<authentication mode="None" /> <authentication mode="None" />
<!-- Correct HTTP runtime settings --> <!-- Correct HTTP runtime settings -->

5
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
View file

@ -407,7 +407,7 @@ namespace WebsitePanel.Providers.HostedSolution
if (tmp.Length > 0) if (tmp.Length > 0)
{ {
string Url = SimpleUrlRoot + tmp[1]; string Url = SimpleUrlRoot + tmp[1];
ActiveDirectoryUtils.SetADObjectPropertyValue(user, "msRTCSIP-BaseSimpleUrl", Url); ActiveDirectoryUtils.SetADObjectPropertyValue(user, "msRTCSIP-BaseSimpleUrl", Url.ToLower());
} }
user.CommitChanges(); user.CommitChanges();
@ -643,9 +643,6 @@ namespace WebsitePanel.Providers.HostedSolution
SimpleUrls.Add(simpleUrl[0]); SimpleUrls.Add(simpleUrl[0]);
} }
Hashtable properties = new Hashtable();
properties.Add("Add", SimpleUrls);
//PSListModifier //PSListModifier
cmd = new Command("Set-CsSimpleUrlConfiguration"); cmd = new Command("Set-CsSimpleUrlConfiguration");
cmd.Parameters.Add("Identity", "Global"); cmd.Parameters.Add("Identity", "Global");