diff options
| author | Patrick Barron <18354464+barronpm@users.noreply.github.com> | 2020-05-13 19:06:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 19:06:04 +0000 |
| commit | a8f0d0aa0dfe589f4dd5148d0c328bf83271ffb2 (patch) | |
| tree | fb1d6d677e75aaa3abff0afb6f87d15982fe109f /Jellyfin.Server/Program.cs | |
| parent | 511d20a100398baca38f24adfabc56f6f3cfac9c (diff) | |
| parent | f08830ea00e7111d68f12b001995edc56177f6e4 (diff) | |
Merge branch 'master' into activitydb-efcore
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 => { |