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

Proposed by Colin Watson on 2015-09-15
Status: Merged
Merged at revision: 202
Proposed branch: lp:~cjwatson/charms/trusty/ubuntu-repository-cache/inline-release
Merge into: lp:charms/trusty/ubuntu-repository-cache
Diff against target: 12 lines (+1/-1)
1 file modified
templates/apache2/archive_ubuntu_com.conf (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/charms/trusty/ubuntu-repository-cache/inline-release
Reviewer Review Type Date Requested Status
Charles Butler (community) 2015-09-15 Approve on 2015-09-17
Dan Watkins (community) Approve on 2015-09-17
Review via email: mp+271107@code.launchpad.net

Commit message

Prepare Apache configuration for InRelease files in archives.

Description of the change

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.

To post a comment you must log in.
Dan Watkins (daniel-thewatkins) wrote :

LGTM

review: Approve
Charles Butler (lazypower) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/apache2/archive_ubuntu_com.conf'
2--- templates/apache2/archive_ubuntu_com.conf 2015-03-11 01:39:24 +0000
3+++ templates/apache2/archive_ubuntu_com.conf 2015-09-15 11:37:10 +0000
4@@ -16,7 +16,7 @@
5 DocumentRoot {{ DocumentRoot }}/www
6 # Munge the Cache-Control/Expires response headers to try make
7 # transparent proxy servers DTRT.
8- <Files ~ "Release(\.gpg)?|Packages\.(bz2|gz)|Sources\.(bz2|gz)?|Translation-.*?$">
9+ <Files ~ "Release(\.gpg)?|InRelease|Packages\.(bz2|gz)|Sources\.(bz2|gz)?|Translation-.*?$">
10 ExpiresActive On
11 ExpiresDefault "modification plus 1800 seconds"
12 Header append Cache-Control "proxy-revalidate"

Subscribers

People subscribed via source and target branches

to all changes: