launchpad-reviewers team mailing list archive

[Guruprasad <mp+458127@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:codehosting-charm-https-vhost-config-fixes into launchpad:master.

Commit message:
charm/launchpad-codehosting: Fix a bug in the bzr https vhost config

When renaming all the previous occurrences of
'codebrowse_internal_endpoint' to 'internal_codebrowse_root', this was
missed and it is causing the rewrite rule to be wrong.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/458127
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:codehosting-charm-https-vhost-config-fixes into launchpad:master.

diff --git a/charm/launchpad-codehosting/templates/vhosts/bazaar_https.conf.j2 b/charm/launchpad-codehosting/templates/vhosts/bazaar_https.conf.j2
index e531b50..2740a53 100644
--- a/charm/launchpad-codehosting/templates/vhosts/bazaar_https.conf.j2
+++ b/charm/launchpad-codehosting/templates/vhosts/bazaar_https.conf.j2
@@ -33,6 +33,6 @@
   RewriteRule ^/robots.txt$ - [L]
   RewriteRule ^/favicon.ico$ {{ loggerhead_static_dir }}/images/favicon.ico [L]
   RewriteRule ^/static/(.*)$ /$1 [L]
-  RewriteRule ^/(.*)$ {{ codebrowse_internal_endpoint }}/$1 [P,L]
+  RewriteRule ^/(.*)$ {{ internal_codebrowse_root }}/$1 [P,L]
 </VirtualHost>