From 1ab3df03a350419e31d17458fbb6ff18b2990440 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 | 2 ++ src/Radarr.Api.V3/Config/HostConfigResource.cs | 4 +++- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/frontend/src/Settings/General/HostSettings.js b/frontend/src/Settings/General/HostSettings.js index b864faad3..4736e9a01 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, @@ -90,6 +91,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 c51b27722..c7252e5d7 100644 --- a/src/NzbDrone.Core/Configuration/IConfigService.cs +++ b/src/NzbDrone.Core/Configuration/IConfigService.cs @@ -104,5 +104,6 @@ namespace NzbDrone.Core.Configuration int BackupRetention { get; } 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 ec02f86a0..3f096ced0 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -50,6 +50,8 @@ "ApiKey": "API Key", "AppDataDirectory": "AppData directory", "AppDataLocationHealthCheckMessage": "Updating will not be possible to prevent deleting AppData on Update", + "ApplicationURL": "Application URL", + "ApplicationUrlHelpText": "This application's external URL including http(s)://, port and URL base", "Apply": "Apply", "ApplyTags": "Apply Tags", "ApplyTagsHelpTexts1": "How to apply tags to the selected movies", diff --git a/src/Radarr.Api.V3/Config/HostConfigResource.cs b/src/Radarr.Api.V3/Config/HostConfigResource.cs index 836eaf25d..d563df4f8 100644 --- a/src/Radarr.Api.V3/Config/HostConfigResource.cs +++ b/src/Radarr.Api.V3/Config/HostConfigResource.cs @@ -26,6 +26,7 @@ namespace Radarr.Api.V3.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; } @@ -82,7 +83,8 @@ namespace Radarr.Api.V3.Config CertificateValidation = configService.CertificateValidation, BackupFolder = configService.BackupFolder, BackupInterval = configService.BackupInterval, - BackupRetention = configService.BackupRetention + BackupRetention = configService.BackupRetention, + ApplicationUrl = configService.ApplicationUrl }; } }