Merge lp:~cjwatson/charms/trusty/ubuntu-repository-cache/inline-release into lp:charms/trusty/ubuntu-repository-cache

[Colin Watson]

Prepare Apache configuration for InRelease files in archives.

Prepare Apache configuration for InRelease files in archives.

We intend to add InRelease support to Launchpad soon, as part of making the archive format more robust. In preparation for this, things related to mirroring need to handle InRelease the same way they already handle Release and Release.gpg.

[Dan Watkins (oddbloke)]

LGTM

review: Approve

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'templates/apache2/archive_ubuntu_com.conf'
--- templates/apache2/archive_ubuntu_com.conf	2015-03-11 01:39:24 +0000
+++ templates/apache2/archive_ubuntu_com.conf	2015-09-15 11:37:10 +0000
@@ -16,7 +16,7 @@
         DocumentRoot {{ DocumentRoot }}/www
         # Munge the Cache-Control/Expires response headers to try make
         # transparent proxy servers DTRT.
-        <Files ~ "Release(\.gpg)?|Packages\.(bz2|gz)|Sources\.(bz2|gz)?|Translation-.*?$">
+        <Files ~ "Release(\.gpg)?|InRelease|Packages\.(bz2|gz)|Sources\.(bz2|gz)?|Translation-.*?$">
                 ExpiresActive On
                 ExpiresDefault "modification plus 1800 seconds"
                 Header append Cache-Control "proxy-revalidate"