Merge ~mthaddon/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:sendfile into ubuntu-mirror-charm:master

[Tom Haddon]

Add sendfile support

Add sendfile support

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

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

[Junien F (axino)]

+1

review: Approve

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

Change successfully merged at revision 956a973cf19e95d0d1f5e68e353c40a151a56a4f

diff --git a/files/sendfile.conf b/files/sendfile.conf
new file mode 100644
index 0000000..b67075f
--- /dev/null
+++ b/files/sendfile.conf
@@ -0,0 +1,2 @@
+# File managed by Juju.
+EnableSendfile on
diff --git a/hooks/hooks.py b/hooks/hooks.py
index afabcbe..e39276b 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -592,6 +592,16 @@ def configure_apache(conf, hostname):  # noqa: C901
             check_call(['/usr/sbin/a2enmod', 'ssl'])
             restart_for_ssl = True
 
+    # Enable sendfile
+    restart_for_sendfile = False
+    sendfile_dest = os.path.join(apache_dir, "conf-available", "juju-sendfile.conf")
+    sendfile_src = os.path.join(charm_dir(), "files", "sendfile.conf")
+    if not os.path.exists(sendfile_dest) or (open(sendfile_dest, 'r').read() != open(sendfile_src, 'r').read()):
+        shutil.copyfile(sendfile_src, sendfile_dest)
+        os.chmod(sendfile_dest, 0o644)
+        check_call(["/usr/sbin/a2enconf", "juju-sendfile"])
+        restart_for_sendfile = True
+
     # Remove all other vhosts
     unwanted_vhosts = set(conf.role_list()) - set(wanted_vhosts)
     # always disable default
@@ -636,7 +646,7 @@ def configure_apache(conf, hostname):  # noqa: C901
         override_file = '{}/override.conf'.format(systemd_apachedir)
         file_from_template("systemd-apache-override.tmpl", override_file, tmpl_data)
 
-    if restart_for_mpm or restart_for_ssl:
+    if restart_for_mpm or restart_for_ssl or restart_for_sendfile:
         log("CHARM: Restarting apache")
         check_call('systemctl daemon-reload'.split())
         service_restart("apache2")