launchpad-reviewers team mailing list archive

[Colin Watson <mp+453823@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-fix-tour into launchpad:master.

Commit message:
charm: Send +tour requests to appserver, not assets

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #2039479 in Launchpad itself: "Broken ‘Take the tour’  links across Launchpad"
  https://bugs.launchpad.net/launchpad/+bug/2039479

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/453823

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-fix-tour into launchpad:master.

diff --git a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
index 9b9598d..16708c2 100644
--- a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
+++ b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
@@ -49,7 +49,7 @@
     RewriteRule ^/(\+apidoc.*)$ balancer://cached-launchpad-assets/$1 [P,L]
     RewriteRule ^/(\+combo/.*)$ balancer://cached-launchpad-assets/$1 [P,L]
     RewriteRule ^/(\+icing/.*)$ balancer://cached-launchpad-assets/$1 [P,L]
-    RewriteRule ^/(\+tour.*)$ balancer://cached-launchpad-assets/$1 [P,L]
+    RewriteRule ^/(\+tour.*)$ balancer://cached-launchpad-appserver-main/$1 [P,L]
     RewriteRule ^/(@@/.*)$ balancer://cached-launchpad-assets/$1 [P,L]
     RewriteRule ^/(favicon\.(?:ico|gif|png))$ balancer://cached-launchpad-assets/$1 [P,L]