diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2020-05-13 20:36:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 20:36:54 +0300 |
| commit | f08830ea00e7111d68f12b001995edc56177f6e4 (patch) | |
| tree | 129e4760dac57a5cb69977c991d57eb9e9a63614 /Jellyfin.Server/Program.cs | |
| parent | 69676373ca01411dc1053677974a9b519b5a253e (diff) | |
| parent | 51cdb30741e5ad3d6ec9dc8a5383dc84d60f747a (diff) | |
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index ae423532e..b9895386f 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -10,14 +10,11 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using CommandLine; -using Emby.Drawing; using Emby.Server.Implementations; using Emby.Server.Implementations.HttpServer; using Emby.Server.Implementations.IO; using Emby.Server.Implementations.Networking; -using Jellyfin.Drawing.Skia; using MediaBrowser.Common.Configuration; -using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Extensions; using MediaBrowser.WebDashboard.Api; using Microsoft.AspNetCore.Hosting; @@ -297,7 +294,7 @@ namespace Jellyfin.Server { _logger.LogInformation("Kestrel listening on {IpAddress}", address); options.Listen(address, appHost.HttpPort); - if (appHost.EnableHttps && appHost.Certificate != null) + if (appHost.ListenWithHttps) { options.Listen(address, appHost.HttpsPort, listenOptions => { @@ -327,7 +324,7 @@ namespace Jellyfin.Server _logger.LogInformation("Kestrel listening on all interfaces"); options.ListenAnyIP(appHost.HttpPort); - if (appHost.EnableHttps && appHost.Certificate != null) + if (appHost.ListenWithHttps) { options.ListenAnyIP(appHost.HttpsPort, listenOptions => { |