mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-08-06 14:17:06 +02:00
Merge eb79e93724
into 6d4efe6523
This commit is contained in:
commit
70e89e6ab1
@ -77,22 +77,20 @@ public static class WebHostBuilderExtensions
|
||||
WebHostBuilderContext builderContext,
|
||||
KestrelServerOptions options)
|
||||
{
|
||||
bool flagged = false;
|
||||
foreach (var netAdd in addresses)
|
||||
var flagged = false;
|
||||
|
||||
void ConfigureHttps(ListenOptions listenOptions)
|
||||
{
|
||||
var address = netAdd.Address;
|
||||
logger.LogInformation("Kestrel is listening on {Address}", address.Equals(IPAddress.IPv6Any) ? "all interfaces" : address);
|
||||
options.Listen(netAdd.Address, httpPort);
|
||||
if (httpsPort.HasValue)
|
||||
if (!httpsPort.HasValue)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (builderContext.HostingEnvironment.IsDevelopment())
|
||||
{
|
||||
try
|
||||
{
|
||||
options.Listen(
|
||||
address,
|
||||
httpsPort.Value,
|
||||
listenOptions => listenOptions.UseHttps());
|
||||
listenOptions.UseHttps();
|
||||
}
|
||||
catch (InvalidOperationException)
|
||||
{
|
||||
@ -110,12 +108,19 @@ public static class WebHostBuilderExtensions
|
||||
throw new InvalidOperationException("Cannot run jellyfin with https without setting a valid certificate.");
|
||||
}
|
||||
|
||||
options.Listen(
|
||||
address,
|
||||
httpsPort.Value,
|
||||
listenOptions => listenOptions.UseHttps(certificate));
|
||||
listenOptions.UseHttps(certificate);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var netAdd in addresses)
|
||||
{
|
||||
var address = netAdd.Address;
|
||||
logger.LogInformation("Kestrel is listening on {Address}", address.Equals(IPAddress.IPv6Any) ? "all interfaces" : address);
|
||||
options.Listen(address, httpPort);
|
||||
if (httpsPort.HasValue)
|
||||
{
|
||||
options.Listen(address, httpsPort.Value, ConfigureHttps);
|
||||
}
|
||||
}
|
||||
|
||||
// Bind to unix socket (only on unix systems)
|
||||
@ -129,8 +134,9 @@ public static class WebHostBuilderExtensions
|
||||
File.Delete(socketPath);
|
||||
}
|
||||
|
||||
options.ListenUnixSocket(socketPath);
|
||||
logger.LogInformation("Kestrel listening to unix socket {SocketPath}", socketPath);
|
||||
options.ListenUnixSocket(socketPath, ConfigureHttps);
|
||||
|
||||
logger.LogInformation("Kestrel listening on unix socket {SocketPath}", socketPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user