mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-06 22:27:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge eb79e93724 into 6d4efe6523

Browse Source
This commit is contained in:
Ingmar Stein 2025-08-05 12:15:22 +05:30 committed by GitHub
commit 70e89e6ab1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Jellyfin.Server/Extensions/WebHostBuilderExtensions.cs
View File

@ -77,44 +77,49 @@ public static class WebHostBuilderExtensions
WebHostBuilderContext builderContext, WebHostBuilderContext builderContext,
KestrelServerOptions options) KestrelServerOptions options)
{ {
bool flagged = false; var flagged = false;
void ConfigureHttps(ListenOptions listenOptions)
{
if (!httpsPort.HasValue)
{
return;
}
if (builderContext.HostingEnvironment.IsDevelopment())
{
try
{
listenOptions.UseHttps();
}
catch (InvalidOperationException)
{
if (!flagged)
{
logger.LogWarning("Failed to listen to HTTPS using the ASP.NET Core HTTPS development certificate. Please ensure it has been installed and set as trusted");
flagged = true;
}
}
}
else
{
if (certificate is null)
{
throw new InvalidOperationException("Cannot run jellyfin with https without setting a valid certificate.");
}
listenOptions.UseHttps(certificate);
}
}
foreach (var netAdd in addresses) foreach (var netAdd in addresses)
{ {
var address = netAdd.Address; var address = netAdd.Address;
logger.LogInformation("Kestrel is listening on {Address}", address.Equals(IPAddress.IPv6Any) ? "all interfaces" : address); logger.LogInformation("Kestrel is listening on {Address}", address.Equals(IPAddress.IPv6Any) ? "all interfaces" : address);
options.Listen(netAdd.Address, httpPort); options.Listen(address, httpPort);
if (httpsPort.HasValue) if (httpsPort.HasValue)
{ {
if (builderContext.HostingEnvironment.IsDevelopment()) options.Listen(address, httpsPort.Value, ConfigureHttps);
{
try
{
options.Listen(
address,
httpsPort.Value,
listenOptions => listenOptions.UseHttps());
}
catch (InvalidOperationException)
{
if (!flagged)
{
logger.LogWarning("Failed to listen to HTTPS using the ASP.NET Core HTTPS development certificate. Please ensure it has been installed and set as trusted");
flagged = true;
}
}
}
else
{
if (certificate is null)
{
throw new InvalidOperationException("Cannot run jellyfin with https without setting a valid certificate.");
}
options.Listen(
address,
httpsPort.Value,
listenOptions => listenOptions.UseHttps(certificate));
}
} }
} }
@ -129,8 +134,9 @@ public static class WebHostBuilderExtensions
File.Delete(socketPath); File.Delete(socketPath);
} }
options.ListenUnixSocket(socketPath); options.ListenUnixSocket(socketPath, ConfigureHttps);
logger.LogInformation("Kestrel listening to unix socket {SocketPath}", socketPath);
logger.LogInformation("Kestrel listening on unix socket {SocketPath}", socketPath);
} }
} }
} }