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-10-04 09:03:15 +04:00
commit d28dc2f1d8
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Virtualization/VirtualizationServerController.cs
View file

@ -3266,7 +3266,7 @@ namespace WebsitePanel.EnterpriseServer
var ip = IPAddress.Parse(subnetMask); var ip = IPAddress.Parse(subnetMask);
if (ip.V4) { if (ip.V4) {
int cidr = 32; int cidr = 32;
long mask = (long)ip.Address; var mask = ip.Address;
while ((mask & 1) == 0 && cidr > 0) { while ((mask & 1) == 0 && cidr > 0) {
mask >>= 1; mask >>= 1;
cidr -= 1; cidr -= 1;

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

@ -5,11 +5,11 @@
</configSections> </configSections>
<!-- Connection strings --> <!-- Connection strings -->
<connectionStrings> <connectionStrings>
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" providerName="System.Data.SqlClient" /> <add name="EnterpriseServer" connectionString="server=(local)\SQLEXPRESS;database=WebsitePanel_dev;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- Encryption util settings --> <!-- Encryption util settings -->
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" /> <add key="WebsitePanel.CryptoKey" value="1234567890" />
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true" /> <add key="WebsitePanel.EncryptionEnabled" value="true" />
<!-- Web Applications --> <!-- Web Applications -->

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

@ -276,11 +276,13 @@ namespace WebsitePanel.Portal
if (site.IsDedicatedIP) if (site.IsDedicatedIP)
{ {
IsDedicatedIP = true; IsDedicatedIP = true;
WebsitesSSLControl.Visible = true;
WebsitesSSLControl.BindWebItem(site); WebsitesSSLControl.BindWebItem(site);
} }
else else
{ {
IsDedicatedIP = false; IsDedicatedIP = false;
WebsitesSSLControl.Visible = false;
} }
BindVirtualDirectories(); BindVirtualDirectories();