Bind HTTPS ports when running with development environment flag

This commit is contained in:
Mark Monteiro 2020-03-21 21:31:22 +01:00
parent edc974e4c0
commit 54cbf9c4dc
1 changed files with 19 additions and 1 deletions

View File

@ -20,9 +20,11 @@ using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Drawing;
using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Globalization;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using Serilog; using Serilog;
@ -236,7 +238,7 @@ namespace Jellyfin.Server
private static IWebHostBuilder CreateWebHostBuilder(ApplicationHost appHost, IServiceCollection serviceCollection, IApplicationPaths appPaths) private static IWebHostBuilder CreateWebHostBuilder(ApplicationHost appHost, IServiceCollection serviceCollection, IApplicationPaths appPaths)
{ {
return new WebHostBuilder() return new WebHostBuilder()
.UseKestrel(options => .UseKestrel((builderContext, options) =>
{ {
var addresses = appHost.ServerConfigurationManager var addresses = appHost.ServerConfigurationManager
.Configuration .Configuration
@ -258,6 +260,14 @@ namespace Jellyfin.Server
appHost.HttpsPort, appHost.HttpsPort,
listenOptions => listenOptions.UseHttps(appHost.Certificate)); listenOptions => listenOptions.UseHttps(appHost.Certificate));
} }
else if (builderContext.HostingEnvironment.IsDevelopment())
{
options.Listen(address, appHost.HttpsPort, listenOptions =>
{
listenOptions.UseHttps();
listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
});
}
} }
} }
else else
@ -271,6 +281,14 @@ namespace Jellyfin.Server
appHost.HttpsPort, appHost.HttpsPort,
listenOptions => listenOptions.UseHttps(appHost.Certificate)); listenOptions => listenOptions.UseHttps(appHost.Certificate));
} }
else if (builderContext.HostingEnvironment.IsDevelopment())
{
options.ListenAnyIP(appHost.HttpsPort, listenOptions =>
{
listenOptions.UseHttps();
listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
});
}
} }
}) })
.ConfigureAppConfiguration(config => config.ConfigureAppConfiguration(appPaths)) .ConfigureAppConfiguration(config => config.ConfigureAppConfiguration(appPaths))