Merge ~ballot/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:disable_default into ubuntu-mirror-charm:master

[Benjamin Allot]

Always disable the default apache website

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

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

[Haw Loeung (hloeung)]

Also see James' comment here:

| https://code.launchpad.net/~hloeung/canonical-is-charms/ubuntu-mirror-default-vhost-and-server-status/+merge/254717

Maybe the default vhost could just be a blank page and not display the apache2 default page?

[Benjamin Allot (ballot)]

> Also see James' comment here:
>
> | https://code.launchpad.net/~hloeung/canonical-is-charms/ubuntu-mirror-
> default-vhost-and-server-status/+merge/254717
>
> Maybe the default vhost could just be a blank page and not display the apache2
> default page?

I'm completely fine with adding a blank page instead. I thought it was not providing any value at the moment and I had to fix this as PVG after a Reddit thread started to booooo us for letting this default page visible so I quickly worked on this fix (and disabled live the default site).

AFAIU, James comment was mostly about the Host header thing rather than the default page ?

[Benjamin Allot (ballot)]

Comment inline on the .conf stuff

[Haw Loeung (hloeung)]

Works for me, we'll have to address it differently now that the charm supports multiple roles (releases, archive, security).

Filed LP:1879801 to address and fix the charm to not allow requests by IP.

[Haw Loeung (hloeung)]

review: Approve (+1)

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

Change successfully merged at revision eec9c03dff923a088b3c54ec95ae465c9db40dcd

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 2befc02..7dfa42a 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -395,6 +395,10 @@ def configure_apache():
 
     # Remove all other vhosts
     unwanted_vhosts = set(conf.role_list()) - set(wanted_vhosts)
+    # always disable default
+    default_site = "000-default.conf"
+    if os.path.exists(os.path.join(enabled_dir, default_site)):
+        unwanted_vhosts.add(default_site)
     for vhost in unwanted_vhosts:
         check_call(["/usr/sbin/a2dissite", vhost])
         if os.path.isfile(os.path.join(available_dir, vhost)):