Launchpad itself

Merge ~cjwatson/launchpad:charm-fix-tour into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-fix-tour
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: dca807cb75561dffc57de3479d5308205a3aad44
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-fix-tour
Merge into: launchpad:master
Diff against target: 12 lines (+1/-1)
1 file modified
charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+453823@code.launchpad.net

Commit message

charm: Send +tour requests to appserver, not assets

Description of the change

The assets charm doesn't serve anything under this path, and as far as I can see the pre-charm frontends never treated these requests as ones for assets; this was just a migration error.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
2index 9b9598d..16708c2 100644
3--- a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
4+++ b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
5@@ -49,7 +49,7 @@
6 RewriteRule ^/(\+apidoc.*)$ balancer://cached-launchpad-assets/$1 [P,L]
7 RewriteRule ^/(\+combo/.*)$ balancer://cached-launchpad-assets/$1 [P,L]
8 RewriteRule ^/(\+icing/.*)$ balancer://cached-launchpad-assets/$1 [P,L]
9- RewriteRule ^/(\+tour.*)$ balancer://cached-launchpad-assets/$1 [P,L]
10+ RewriteRule ^/(\+tour.*)$ balancer://cached-launchpad-appserver-main/$1 [P,L]
11 RewriteRule ^/(@@/.*)$ balancer://cached-launchpad-assets/$1 [P,L]
12 RewriteRule ^/(favicon\.(?:ico|gif|png))$ balancer://cached-launchpad-assets/$1 [P,L]
13

Subscribers

People subscribed via source and target branches

to status/vote changes: