Add configuration flag for Web directory

This commit is contained in:
Joshua Boniface
2019-03-10 16:17:48 -04:00
parent 4b91c9bf66
commit 93d15cd969
4 changed files with 28 additions and 4 deletions

View File

@@ -264,6 +264,23 @@ namespace Jellyfin.Server
}
}
// webDir
// IF --webdir
// ELSE IF $JELLYFIN_WEB_DIR
// ELSE use <bindir>/jellyfin-web
var webDir = options.WebDir;
if (string.IsNullOrEmpty(webDir))
{
webDir = Environment.GetEnvironmentVariable("JELLYFIN_WEB_DIR");
if (string.IsNullOrEmpty(webDir))
{
// Use default location under ResourcesPath
webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web")
}
}
// logDir
// IF --logdir
// ELSE IF $JELLYFIN_LOG_DIR
@@ -296,7 +313,7 @@ namespace Jellyfin.Server
Environment.Exit(1);
}
return new ServerApplicationPaths(dataDir, logDir, configDir, cacheDir);
return new ServerApplicationPaths(dataDir, logDir, configDir, cacheDir, webDir);
}
private static async Task<IConfiguration> CreateConfiguration(IApplicationPaths appPaths)