From 202836110ec8cd52ab7f685f2206bbd5f26557c0 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sun, 7 Aug 2022 14:54:39 -0400 Subject: [PATCH] New: Add application URL to host configuration settings (cherry picked from commit 762042ba97c2ae689cee32d8e66a458f6d7a8adc) --- frontend/src/Settings/General/HostSettings.js | 16 ++++++++++++++++ src/NzbDrone.Core/Configuration/ConfigService.cs | 2 ++ .../Configuration/IConfigService.cs | 1 + src/NzbDrone.Core/Localization/Core/en.json | 4 +++- src/Prowlarr.Api.V1/Config/HostConfigResource.cs | 2 ++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/frontend/src/Settings/General/HostSettings.js b/frontend/src/Settings/General/HostSettings.js index 5445808b0..99255b0d5 100644 --- a/frontend/src/Settings/General/HostSettings.js +++ b/frontend/src/Settings/General/HostSettings.js @@ -21,6 +21,7 @@ function HostSettings(props) { port, urlBase, instanceName, + applicationUrl, enableSsl, sslPort, sslCertPath, @@ -89,6 +90,21 @@ function HostSettings(props) { /> + + {translate('ApplicationURL')} + + + + GetValueEnum("CertificateValidation", CertificateValidationType.Enabled); + public string ApplicationUrl => GetValue("ApplicationUrl", string.Empty); + private string GetValue(string key) { return GetValue(key, string.Empty); diff --git a/src/NzbDrone.Core/Configuration/IConfigService.cs b/src/NzbDrone.Core/Configuration/IConfigService.cs index 4f37b8d51..5fa2ed005 100644 --- a/src/NzbDrone.Core/Configuration/IConfigService.cs +++ b/src/NzbDrone.Core/Configuration/IConfigService.cs @@ -55,5 +55,6 @@ namespace NzbDrone.Core.Configuration bool LogIndexerResponse { get; set; } CertificateValidationType CertificateValidation { get; } + string ApplicationUrl { get; } } } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 243d5db82..77db15c79 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -34,6 +34,8 @@ "ApplicationLongTermStatusCheckSingleClientMessage": "Applications unavailable due to failures for more than 6 hours: {0}", "ApplicationStatusCheckAllClientMessage": "All applications are unavailable due to failures", "ApplicationStatusCheckSingleClientMessage": "Applications unavailable due to failures: {0}", + "ApplicationURL": "Application URL", + "ApplicationUrlHelpText": "This application's external URL including http(s)://, port and URL base", "Applications": "Applications", "Apply": "Apply", "ApplyTags": "Apply Tags", @@ -508,4 +510,4 @@ "Yes": "Yes", "YesCancel": "Yes, Cancel", "Yesterday": "Yesterday" -} \ No newline at end of file +} diff --git a/src/Prowlarr.Api.V1/Config/HostConfigResource.cs b/src/Prowlarr.Api.V1/Config/HostConfigResource.cs index 38d132615..35f4eca84 100644 --- a/src/Prowlarr.Api.V1/Config/HostConfigResource.cs +++ b/src/Prowlarr.Api.V1/Config/HostConfigResource.cs @@ -27,6 +27,7 @@ namespace Prowlarr.Api.V1.Config public string SslCertPassword { get; set; } public string UrlBase { get; set; } public string InstanceName { get; set; } + public string ApplicationUrl { get; set; } public bool UpdateAutomatically { get; set; } public UpdateMechanism UpdateMechanism { get; set; } public string UpdateScriptPath { get; set; } @@ -86,6 +87,7 @@ namespace Prowlarr.Api.V1.Config BackupFolder = configService.BackupFolder, BackupInterval = configService.BackupInterval, BackupRetention = configService.BackupRetention, + ApplicationUrl = configService.ApplicationUrl, HistoryCleanupDays = configService.HistoryCleanupDays }; }