Merge ~nick-moffitt/ubuntu-mirror-charm:rt155655 into ubuntu-mirror-charm:master

[Nick Moffitt]

RT#155655 Set max age for caching proxies to a little under an hour

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

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

[Nick Moffitt (nick-moffitt)]

This is something we already do on security.ubuntu.com and it apparently helps prevent thundering-herd problems with load behind caching proxies.

[Laurent Sesquès (sajoupa)]

review: Approve

[Simon Déziel (sdeziel)]

LGTM but maybe you'd want to have a single appending, like that:

Header append Cache-Control "s-maxage=3300, proxy-revalidate"

[Simon Déziel (sdeziel)]

review: Approve

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

Change successfully merged at revision 37ce6b8e26595f9fe828eeed9bf26494882ca3e4

diff --git a/templates/apache-ubuntu.tmpl b/templates/apache-ubuntu.tmpl
index be7c7fd..4cccf42 100644
--- a/templates/apache-ubuntu.tmpl
+++ b/templates/apache-ubuntu.tmpl
@@ -32,6 +32,7 @@
         ExpiresActive On
         ExpiresDefault "modification plus 1800 seconds"
         Header append Cache-Control "proxy-revalidate"
+        Header append Cache-Control "s-maxage=3300"
     </Files>
     # Allow intermediate caches to cache .deb|.udeb|.ddeb files for a day.
     # This could be increased in the future since deb files are the perfect