Faidon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62324


Change subject: Varnish: fix mobile frontend's purge issues
......................................................................

Varnish: fix mobile frontend's purge issues

Move rewrite_proxy_urls after vcl_recv_purge and unbreak mobile frontend
purges, as introduced with I3d02804170f7e502300329740cba9f45437a24fa.

Change-Id: I08f7615230037a6ffe7d1130a2a6de7ba370faf2
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/62324/1

diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb 
b/templates/varnish/mobile-frontend.inc.vcl.erb
index a110f19..1bd89c5 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -559,9 +559,6 @@
           header instead.
        */
 
-       /* strip proxy URLs as to not have to rewrite them below too */
-       call rewrite_proxy_urls;
-
        /* Replace <language>.(m|zero).<project>.org by 
<language>.<project>.org */
        set req.http.host = regsub(req.http.host, 
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
 
@@ -582,6 +579,10 @@
        /* Allow purging */
        call vcl_recv_purge;
 
+       /* make absolute URIs relative as to not have to rewrite them too;
+        * do this after vcl_recv_purge, as it operates on a full URI */
+       call rewrite_proxy_urls;
+
        /* FIXME: deploy X-Vary-Options support */
        set req.http.X-Orig-Cookie = req.http.Cookie;
        if( req.http.Cookie ~ "disable" ||

-- 
To view, visit https://gerrit.wikimedia.org/r/62324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08f7615230037a6ffe7d1130a2a6de7ba370faf2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to