Merge pull request #985 from jabbera/SslDashboardFix

Fix ssl port info on dashboard
This commit is contained in:
Luke 2015-01-18 20:00:34 -05:00
commit 1316994324
2 changed files with 7 additions and 0 deletions

View File

@ -122,6 +122,12 @@ namespace MediaBrowser.Model.System
/// <value>The HTTP server port number.</value> /// <value>The HTTP server port number.</value>
public int HttpServerPortNumber { get; set; } public int HttpServerPortNumber { get; set; }
/// <summary>
/// Gets or sets the value pointing to the file system where the ssl certiifcate is located.
/// </summary>
/// <value>The value pointing to the file system where the ssl certiifcate is located.</value>
public bool UseHttps { get; set; }
/// <summary> /// <summary>
/// Gets or sets the HTTPS server port number. /// Gets or sets the HTTPS server port number.
/// </summary> /// </summary>

View File

@ -965,6 +965,7 @@ namespace MediaBrowser.Server.Startup.Common
CachePath = ApplicationPaths.CachePath, CachePath = ApplicationPaths.CachePath,
MacAddress = GetMacAddress(), MacAddress = GetMacAddress(),
HttpServerPortNumber = HttpServerPort, HttpServerPortNumber = HttpServerPort,
UseHttps = this.ServerConfigurationManager.Configuration.UseHttps,
HttpsPortNumber = HttpsServerPort, HttpsPortNumber = HttpsServerPort,
OperatingSystem = OperatingSystemDisplayName, OperatingSystem = OperatingSystemDisplayName,
CanSelfRestart = CanSelfRestart, CanSelfRestart = CanSelfRestart,