Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:maas-redirect-2 into ubuntu-mirror-charm:master

Proposed by Paul Collins
Status: Merged
Approved by: Paul Collins
Approved revision: 21e129c6a8cad46d48d40ccf5edd9bff3ff3326c
Merged at revision: 26b303662692e1af7a5dfa85ff4b449a78bcbb94
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:maas-redirect-2
Merge into: ubuntu-mirror-charm:master
Diff against target: 12 lines (+1/-1)
1 file modified
templates/apache-maas-images.tmpl (+1/-1)
Reviewer Review Type Date Requested Status
Alexandre Gomes Approve
Canonical IS Reviewers Pending
Review via email: mp+398925@code.launchpad.net

Commit message

don't hardcode the base URL when redirecting

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Alexandre Gomes (alejdg) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 26b303662692e1af7a5dfa85ff4b449a78bcbb94

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/apache-maas-images.tmpl b/templates/apache-maas-images.tmpl
2index 819c458..d9357d9 100644
3--- a/templates/apache-maas-images.tmpl
4+++ b/templates/apache-maas-images.tmpl
5@@ -22,7 +22,7 @@ ${apache_early_extra}
6
7 #end if
8 # RT#128160
9- RedirectMatch permanent ^/ephemeral-v3/+daily/(.*) https://images.maas.io/ephemeral-v3/stable/$1
10+ RedirectMatch permanent ^/ephemeral-v3/+daily/(.*) /ephemeral-v3/stable/$1
11
12 DocumentRoot /srv/${name}/www
13

Subscribers

People subscribed via source and target branches