Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Grab content root from config and fix kestrel port bindings

Browse Source
This commit is contained in:
Claus Vium 2019-03-05 07:55:29 +01:00
parent 17ca23d73b
commit 12df381495
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -619,19 +619,23 @@ namespace Emby.Server.Implementations
FindParts(); FindParts();
string contentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath;
if (string.IsNullOrEmpty(contentRoot))
{
contentRoot = Path.Combine(ServerConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "jellyfin-web", "src");
}
Host = new WebHostBuilder() Host = new WebHostBuilder()
.UseKestrel(options => .UseKestrel(options =>
{ {
options.Listen(IPAddress.Any, HttpPort); options.ListenAnyIP(HttpPort);
options.Listen(IPAddress.Loopback, HttpPort);
if (EnableHttps) if (EnableHttps)
{ {
options.Listen(IPAddress.Any, HttpsPort, listenOptions => { listenOptions.UseHttps(Certificate); }); options.ListenAnyIP(HttpsPort, listenOptions => { listenOptions.UseHttps(Certificate); });
options.Listen(IPAddress.Loopback, HttpsPort, listenOptions => { listenOptions.UseHttps(Certificate); });
} }
}) })
.UseContentRoot(Path.Combine(Directory.GetCurrentDirectory(), "jellyfin-web", "src")) .UseContentRoot(contentRoot)
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddResponseCompression(); services.AddResponseCompression();
@ -655,7 +659,7 @@ namespace Emby.Server.Implementations
{ {
if (!context.WebSockets.IsWebSocketRequest) if (!context.WebSockets.IsWebSocketRequest)
{ {
await next(); await next().ConfigureAwait(false);
return; return;
} }
@ -665,7 +669,7 @@ namespace Emby.Server.Implementations
{ {
if (context.WebSockets.IsWebSocketRequest) if (context.WebSockets.IsWebSocketRequest)
{ {
await next(); await next().ConfigureAwait(false);
return; return;
} }