Merge lp:~cjwatson/charms/trusty/ubuntu-repository-cache/xz-indexes into lp:charms/trusty/ubuntu-repository-cache

Proposed by Colin Watson on 2015-11-18
Status: Merged
Merged at revision: 207
Proposed branch: lp:~cjwatson/charms/trusty/ubuntu-repository-cache/xz-indexes
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/xz-indexes
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing on 2015-11-30
James Page 2015-11-18 Resubmit on 2015-11-27
Review via email: mp+277880@code.launchpad.net

Commit message

Prepare Apache configurations for xz index files in archives.

Description of the change

Prepare Apache configurations for xz index files in archives. I hope to add these to Launchpad soon, but we need to prepare things related to mirroring first.

To post a comment you must log in.
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1441/

review: Needs Fixing (automated testing)
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1456/

review: Needs Fixing (automated testing)
James Page (james-page) :
review: Resubmit
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1612/

review: Needs Fixing (automated testing)
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1595/

review: Needs Fixing (automated testing)

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-09-15 11:31:46 +0000
3+++ templates/apache2/archive_ubuntu_com.conf 2015-11-18 17:09:53 +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)?|InRelease|Packages\.(bz2|gz)|Sources\.(bz2|gz)?|Translation-.*?$">
9+ <Files ~ "Release(\.gpg)?|InRelease|Packages\.(xz|bz2|gz)|Sources\.(xz|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: