starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ssl in mediabrowser against new listener.

Browse Source
This commit is contained in:
Mike
2015-01-06 22:36:42 -05:00
parent 7a136349ee
commit 2300d56f68
10 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@@ -133,6 +133,11 @@ namespace MediaBrowser.Server.Startup.Common
"http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/" + WebApplicationName + "/"
};
if (ServerConfigurationManager.Configuration.UseHttps)
{
list.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/" + WebApplicationName + "/");
}
return list;
}
}
@@ -805,7 +810,7 @@ namespace MediaBrowser.Server.Startup.Common
{
try
{
ServerManager.Start(HttpServerUrlPrefixes);
ServerManager.Start(HttpServerUrlPrefixes, CertificatePath);
}
catch (Exception ex)
{
@@ -972,6 +977,8 @@ namespace MediaBrowser.Server.Startup.Common
CachePath = ApplicationPaths.CachePath,
MacAddress = GetMacAddress(),
HttpServerPortNumber = HttpServerPort,
UseHttps = UseHttps,
CertificatePath = CertificatePath,
OperatingSystem = OperatingSystemDisplayName,
CanSelfRestart = CanSelfRestart,
CanSelfUpdate = CanSelfUpdate,
@@ -1046,6 +1053,21 @@ namespace MediaBrowser.Server.Startup.Common
get { return ServerConfigurationManager.Configuration.HttpServerPortNumber; }
}
public bool UseHttps
{
get { return this.ServerConfigurationManager.Configuration.UseHttps; }
}
public string CertificatePath
{
get { return this.ServerConfigurationManager.Configuration.CertificatePath; }
}
public int HttpsServerPort
{
get { return ServerConfigurationManager.Configuration.HttpsPortNumber; }
}
/// <summary>
/// Gets the mac address.
/// </summary>