Jellyfin 11.0.0-PostgreSQL PREVIEW: version bump & defaults
- Update version to 11.0.0-PostgreSQL-PREVIEW in assemblies, installer, and build scripts - Default web directory is now "wwwroot" across all platforms - Configuration manager now creates .example files if missing - Set PostgreSQL as default database with sensible options - Postgres provider ensures database exists before table checks - Add docs for marker conflict fixes and startup.json path issues - Version string in logs/UI uses informational version - Installer output filename and wizard show PREVIEW suffix - Documentation summarizes version bump and verification steps
This commit is contained in:
@@ -138,7 +138,7 @@ public static class StartupHelpers
|
||||
cacheDir = "C:/ProgramData/jellyfin/cache";
|
||||
logDir = "C:/ProgramData/jellyfin/log";
|
||||
tempDir = Path.Combine(Path.GetTempPath(), "jellyfin");
|
||||
webDir = "C:/ProgramData/jellyfin/web";
|
||||
webDir = "C:/ProgramData/jellyfin/wwwroot";
|
||||
osComment = "Windows defaults - using C:/ProgramData/jellyfin";
|
||||
}
|
||||
else if (OperatingSystem.IsLinux())
|
||||
@@ -149,7 +149,7 @@ public static class StartupHelpers
|
||||
cacheDir = "/var/cache/jellyfin";
|
||||
logDir = "/var/log/jellyfin";
|
||||
tempDir = "/var/tmp/jellyfin";
|
||||
webDir = "/usr/share/jellyfin/web";
|
||||
webDir = "/usr/share/jellyfin/wwwroot";
|
||||
osComment = "Linux defaults - following Filesystem Hierarchy Standard (FHS)";
|
||||
}
|
||||
else if (OperatingSystem.IsMacOS())
|
||||
@@ -161,7 +161,7 @@ public static class StartupHelpers
|
||||
cacheDir = Path.Combine(homeDir, "Library", "Caches", "jellyfin");
|
||||
logDir = Path.Combine(homeDir, "Library", "Logs", "jellyfin");
|
||||
tempDir = Path.Combine(Path.GetTempPath(), "jellyfin");
|
||||
webDir = Path.Combine(homeDir, "Library", "Application Support", "jellyfin", "web");
|
||||
webDir = Path.Combine(homeDir, "Library", "Application Support", "jellyfin", "wwwroot");
|
||||
osComment = "macOS defaults - using user Library paths";
|
||||
}
|
||||
else
|
||||
@@ -172,7 +172,7 @@ public static class StartupHelpers
|
||||
cacheDir = "./cache";
|
||||
logDir = "./logs";
|
||||
tempDir = "./temp";
|
||||
webDir = "./web";
|
||||
webDir = "./wwwroot";
|
||||
osComment = "Portable defaults - using relative paths";
|
||||
}
|
||||
|
||||
@@ -272,32 +272,7 @@ public static class StartupHelpers
|
||||
?? startupConfig?.GetValue<string>("Paths:WebDir");
|
||||
if (webDir is null)
|
||||
{
|
||||
// Look for wwwroot folder in the solution root
|
||||
var baseDir = AppContext.BaseDirectory;
|
||||
var currentDir = new DirectoryInfo(baseDir);
|
||||
|
||||
// Navigate up to find the solution root (look for .sln file or stop after a reasonable number of levels)
|
||||
var maxLevelsUp = 5;
|
||||
var levelsChecked = 0;
|
||||
|
||||
while (currentDir != null && levelsChecked < maxLevelsUp)
|
||||
{
|
||||
var wwwrootPath = Path.Combine(currentDir.FullName, "wwwroot");
|
||||
if (Directory.Exists(wwwrootPath))
|
||||
{
|
||||
webDir = wwwrootPath;
|
||||
break;
|
||||
}
|
||||
|
||||
currentDir = currentDir.Parent;
|
||||
levelsChecked++;
|
||||
}
|
||||
|
||||
// Fall back to the old default if wwwroot not found
|
||||
if (webDir is null)
|
||||
{
|
||||
webDir = Path.Join(AppContext.BaseDirectory, "jellyfin-web");
|
||||
}
|
||||
webDir = Path.Join(AppContext.BaseDirectory, "wwwroot");
|
||||
}
|
||||
|
||||
var logDir = options.LogDir
|
||||
|
||||
Reference in New Issue
Block a user