Faidon Liambotis has submitted this change and it was merged.
Change subject: Varnish: remove German version of CentralAutoLogin
......................................................................
Varnish: remove German version of CentralAutoLogin
Remove the /w/index.php?title=Spezial:Zentrale_automatische_Anmeldung/
special handling introduced with
I24419f378dc0e9aacd5ff7dab9dda891d36084ff as the localization of
CentralAutoLogin was removed on the MediaWiki side with
I820370de3afa0bdfce360cba1aef651ac084fd06 and this should now be covered
with the English CentralAutoLogin regexp.
Change-Id: I3e98276a898868a88a7a24947a922027662c0a07
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index e8a79ca..4cbf6c9 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -39,9 +39,7 @@
<% end -%>
call pass_requests;
- if (req.request == "POST" ||
- req.url ~ "^/wiki/Special:CentralAutoLogin/" ||
- req.url ~
"^/w/index.php\?title=Spezial:Zentrale_automatische_Anmeldung/") {
+ if (req.request == "POST" || req.url ~
"^/wiki/Special:CentralAutoLogin/") {
<% if vcl_config.fetch("cluster_tier", "1") != "1" -%>
set req.backend = <%= @vcl_config.fetch("default_backend",
"backend") %>_random;
<% end -%>
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index af9c155..cde37d0 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -68,12 +68,9 @@
call mobile_redirect;
call pass_requests;
- if (req.request == "POST" ||
- req.url ~ "^/wiki/Special:CentralAutoLogin/" ||
- req.url ~
"^/w/index.php?title=Spezial:Zentrale_automatische_Anmeldung/") {
+ if (req.request == "POST" || req.url ~
"^/wiki/Special:CentralAutoLogin/") {
set req.backend = backend_random;
set req.hash_ignore_busy = true;
-
}
/* Users that just logged out, should not get a 304 for their
--
To view, visit https://gerrit.wikimedia.org/r/100796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e98276a898868a88a7a24947a922027662c0a07
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
