Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master

[Haw Loeung]

Fixed, this was removed to reduce complexity but breaks redirect-http-to-https

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 4a4656c49585dc5208b0a52cf17c40bf8b1b6723

diff --git a/lib/haproxy.py b/lib/haproxy.py
index b715a7e..f4b6387 100644
--- a/lib/haproxy.py
+++ b/lib/haproxy.py
@@ -60,14 +60,13 @@ class HAProxyConf:
             if tls_cert_bundle_path:
                 default_port = 443
                 if config[site].get('redirect-http-to-https'):
-                    new['0.0.0.0:80'][site_name] = {}
+                    new.setdefault('0.0.0.0:80', {})
                     # We use a different flag/config here so it's only enabled
                     # on the HTTP, and not the HTTPS, stanza.
-                    new['0.0.0.0:80'][site_name]['enable-redirect-http-to-https'] = True
+                    new['0.0.0.0:80'][site_name] = {'enable-redirect-http-to-https': True}
             port = config[site].get('port', default_port)
             name = '{}:{}'.format(listen_address, port)
-            if name not in new:
-                new[name] = {}
+            new.setdefault(name, {})
             new[name][site] = config[site]
             new[name][site]['port'] = port
 
@@ -75,8 +74,7 @@ class HAProxyConf:
                 if 'backend_port' in loc_conf:
                     port = loc_conf['backend_port']
                     name = '{}:{}'.format(listen_address, port)
-                    if name not in new:
-                        new[name] = {}
+                    new.setdefault(name, {})
                     count = 2
                     new_site = site
                     while new_site in new[name]: