diff --git a/src/Jackett.Server/Program.cs b/src/Jackett.Server/Program.cs index c43db3dc8..b3be92a0f 100644 --- a/src/Jackett.Server/Program.cs +++ b/src/Jackett.Server/Program.cs @@ -107,6 +107,7 @@ namespace Jackett.Server var builder = new ConfigurationBuilder(); builder.AddInMemoryCollection(runtimeDictionary); + builder.AddJsonFile(Path.Combine(configurationService.GetAppDataFolder(), "appsettings.json"), optional: true); Configuration = builder.Build(); @@ -179,11 +180,11 @@ namespace Jackett.Server public static IWebHostBuilder CreateWebHostBuilder(string[] args, string[] urls, string contentRoot) => WebHost.CreateDefaultBuilder(args) - .UseConfiguration(Configuration) .UseContentRoot(contentRoot) .UseWebRoot(contentRoot) .UseUrls(urls) .PreferHostingUrls(true) + .UseConfiguration(Configuration) .UseStartup() .UseNLog(); } diff --git a/src/Jackett.Server/appsettings.Development.json b/src/Jackett.Server/appsettings.Development.json deleted file mode 100644 index fa8ce71a9..000000000 --- a/src/Jackett.Server/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/src/Jackett.Server/appsettings.json b/src/Jackett.Server/appsettings.json deleted file mode 100644 index 26bb0ac7a..000000000 --- a/src/Jackett.Server/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index fb196c48d..997bbed0a 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -233,6 +233,8 @@ namespace Jackett.Updater "Definitions/torrentwtf.yml", "Definitions/eotforum.yml", "Definitions/nexttorrent.yml", + "appsettings.Development.json", + "appsettings.json", }; foreach (var oldFile in oldFiles)