diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 8b16c80a25..2b62c6ba21 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -2182,7 +2182,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont - The 'umbracoApplicationUrl' option is %0% set in your umbracoSettings.config file. + %0% in your umbracoSettings.config file.]]> + The 'umbracoApplicationUrl' option is not set in your umbracoSettings.config file. Set Umbraco application URL in Config Adds a value to the 'umbracoApplicationUrl' option of umbracoSettings.config to prevent configuring insecure endpoint as the hostname of your Umbraco application. %0% in your umbracoSettings.config file.]]> diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 9ce74e904b..79121d015d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2219,7 +2219,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont - The 'umbracoApplicationUrl' option is %0% set in your umbracoSettings.config file. + %0% in your umbracoSettings.config file.]]> + The 'umbracoApplicationUrl' option is not set in your umbracoSettings.config file. Set Umbraco application URL in Config Adds a value to the 'umbracoApplicationUrl' option of umbracoSettings.config to prevent configuring insecure endpoint as the hostname of your Umbraco application. %0% in your umbracoSettings.config file.]]> diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/UmbracoApplicationUrlCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/UmbracoApplicationUrlCheck.cs index f5e571a86a..bc14f43235 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Security/UmbracoApplicationUrlCheck.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/Security/UmbracoApplicationUrlCheck.cs @@ -52,20 +52,28 @@ namespace Umbraco.Web.HealthCheck.Checks.Security private HealthCheckStatus CheckUmbracoApplicationUrl() { - var urlConfigured = !_settings.WebRouting.UmbracoApplicationUrl.IsNullOrWhiteSpace(); + var url = _settings.WebRouting.UmbracoApplicationUrl; + + string resultMessage; + StatusResultType resultType; var actions = new List(); - string resultMessage = _textService.Localize("healthcheck", "umbracoApplicationUrlCheckResult", new[] { urlConfigured ? string.Empty : "not" }); - StatusResultType resultType = urlConfigured ? StatusResultType.Success : StatusResultType.Warning; - - if (urlConfigured == false) + if (url.IsNullOrWhiteSpace()) { + resultMessage = _textService.Localize("healthcheck", "umbracoApplicationUrlCheckResultFalse"); + resultType = StatusResultType.Warning; + actions.Add(new HealthCheckAction(SetApplicationUrlAction, Id) { Name = _textService.Localize("healthcheck", "umbracoApplicationUrlConfigureButton"), Description = _textService.Localize("healthcheck", "umbracoApplicationUrlConfigureDescription") }); } + else + { + resultMessage = _textService.Localize("healthcheck", "umbracoApplicationUrlCheckResultTrue", new[] { url }); + resultType = StatusResultType.Success; + } return new HealthCheckStatus(resultMessage) {