From 85423b1f735f7e162cdb4111f5fe8cc0caafa1a9 Mon Sep 17 00:00:00 2001
From: Pedro Castillo <pedro.castillo@canonical.com>
Date: Tue, 31 May 2022 17:51:24 -0500
Subject: [PATCH] Fix warning messages related to enforce-ssl

When enforce-ssl is set to false, a warning message comes up saying it is
set to true. This should stop the message from coming up when
enforce-ssl is false.

Related-Bug: #1818636
Change-Id: I6afe116c0cd1e04b5c37413c7daf556a9b05dee4
---
 hooks/horizon_contexts.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/hooks/horizon_contexts.py b/hooks/horizon_contexts.py
index 895bdb69..29b3c4ca 100644
--- a/hooks/horizon_contexts.py
+++ b/hooks/horizon_contexts.py
@@ -304,11 +304,12 @@ class ApacheContext(OSContextGenerator):
             "custom_theme": config('custom-theme'),
         }
 
-        if config('enforce-ssl') and https():
-            ctxt['enforce_ssl'] = True
-        else:
-            log("Enforce ssl redirect requested but ssl not configured - "
-                "skipping redirect", level=WARNING)
+        if config('enforce-ssl'):
+            if https():
+                ctxt['enforce_ssl'] = True
+            else:
+                log("Enforce ssl redirect requested but ssl not configured - "
+                    "skipping redirect", level=WARNING)
 
         return ctxt