Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:unsafe-http into ubuntu-mirror-charm:master

[Paul Collins]

add support for "ubuntu-unsafe" role, to allow setting HTTPProtocolOptions unsafe

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

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

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

Change successfully merged at revision 6134dc9c045eb10b9efda2f679d69c87e0172bde

diff --git a/hooks/Config.py b/hooks/Config.py
index 60c9928..5303a5f 100755
--- a/hooks/Config.py
+++ b/hooks/Config.py
@@ -112,13 +112,22 @@ class Config:
         if role in self._mirror_map:
             return self._mirror_map[role]
 
+        # Some roles are derived from others, which we handle here
+        if role == 'ubuntu-unsafe':
+            base_role = 'ubuntu'
+        else:
+            base_role = role
+
         # Load the map details
-        map = {}
+        map = {
+            'unsafe': role.endswith('-unsafe'),
+            'tmpl_file': str("apache-{}.tmpl".format(base_role)),
+        }
         for key in ["name", "aliases", "path", "description", "rsync_log",
                     "command", "source_url", "rsync_auth",
                     "sync_time", "trigger", "apache_late_extra",
                     "apache_early_extra"]:
-            config_key = "mirror_%s_%s" % (role, key)
+            config_key = "mirror_%s_%s" % (base_role, key)
             try:
                 value = config(config_key)
             except ValueError:
@@ -130,14 +139,14 @@ class Config:
                 try:
                     map[key] = str(base64.b64decode(value))
                 except TypeError:
-                    log("CHARM: Unable to decode {} trigger".format(role))
+                    log("CHARM: Unable to decode {} trigger".format(base_role))
                     map[key] = ""
             elif key in ["aliases", "rsync_auth"]:
                 # List/dict expanson needed
                 try:
                     map[key] = json.loads(str(value))
                 except ValueError:
-                    log("CHARM: Unable to decode {} aliases".format(role))
+                    log("CHARM: Unable to decode {} aliases".format(base_role))
                     map[key] = []
             elif key in ["rsync_log"]:
                 # No conversion needed
@@ -212,7 +221,7 @@ class Config:
 
     # This should contain a list of all roles the charm supports
     def role_list(self):
-        return ["cdimage", "ports", "releases", "ubuntu", "cloud-image", "simple-streams"]
+        return ["cdimage", "ports", "releases", "ubuntu", "cloud-image", "simple-streams", "ubuntu-unsafe"]
 
     def roles(self):
         if not config("role_map"):
diff --git a/hooks/hooks.py b/hooks/hooks.py
index db609fb..c42f725 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -341,18 +341,24 @@ def configure_apache():
             log("CHARM: Missing details - skipping {}".format(role))
         else:
             role_config = get_role_config(roles, hostname, role)
+            if mirror['unsafe'] and 'addresses' not in role_config:
+                log("CHARM: {} has no addresses defined - not configuring".format(role))
+                continue
             wanted_vhosts.append(role)
             sites_available = os.path.join(available_dir, role + ".conf")
             sites_enabled = os.path.join(enabled_dir, role + ".conf")
             tmpl_data = mirror
             tmpl_data.update(apache_tls_settings)
+            if 'name' in role_config:
+                tmpl_data['name'] = role_config['name']
+                # If name is overridden then aliases must be too:
+                tmpl_data['aliases'] = role_config.get('aliases', [])
             tmpl_data["logdir"] = apache_logdir
             tmpl_data["addresses"] = role_config.get('addresses', ['*'])
             all_addresses.update(tmpl_data["addresses"])
             tmpl_data["ports"] = [80, 443] if role_config.get('https') else [80]
             all_ports.update(tmpl_data["ports"])
-            tmpl_file = str("apache-{}.tmpl".format(role))
-            file_from_template(tmpl_file, sites_available, tmpl_data)
+            file_from_template(mirror['tmpl_file'], sites_available, tmpl_data)
             symlink(sites_available, sites_enabled)
 
             # And make sure the docroot exists
diff --git a/templates/apache-ubuntu.tmpl b/templates/apache-ubuntu.tmpl
index 2c2df87..5dbb4fb 100644
--- a/templates/apache-ubuntu.tmpl
+++ b/templates/apache-ubuntu.tmpl
@@ -11,6 +11,11 @@ ${apache_early_extra}
     ErrorLog ${logdir}/${name}-error.log
     LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
 
+#if $unsafe
+    # LP:1868232 (cRT#125271)
+    HTTPProtocolOptions unsafe
+
+#end if
 #if $port == 443
     SSLEngine On
     SSLCertificateFile /etc/apache2/ssl/${name}.crt