Mark Bergsma has submitted this change and it was merged.
Change subject: Varnish rules for Beta cluster
......................................................................
Varnish rules for Beta cluster
Change-Id: I4788221afff60f5eeda3f5405cac8a7937bdcd47
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 10 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index a986ef0..6e4ea10 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -570,18 +570,11 @@
header instead.
*/
- /* Replace <language>.m.<project>.org by <language>.<project>.org */
- if ( req.http.host ~ "^([a-zA-Z0-9-]+)\.m\.([a-zA-Z0-9-]+)\.org" ) {
- set req.http.host = regsub( req.http.host,
"^([a-zA-Z0-9-]+)\.m\.([a-zA-Z0-9-]+)\.org", "\1.\2.org");
- }
-
- /* Replace <language>.zero.<project>.org by <language>.<project>.org
and set X-Carrier */
- else if ( req.http.host ~
"^([a-zA-Z0-9-]+)\.zero\.([a-zA-Z0-9-]+)\.org" ) {
- set req.http.host = regsub( req.http.host,
"^([a-zA-Z0-9-]+)\.zero\.([a-zA-Z0-9-]+)\.org", "\1.\2.org");
- }
+ /* 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.");
/* Rewrite <language>.wap.wikipedia.org to new mobile site */
- else if ( req.http.host ~ "^([a-zA-Z0-9-]+)\.wap\.([a-zA-Z0-9-]+)\.org"
) {
+ if ( req.http.host ~ "^([a-zA-Z0-9-]+)\.wap\.([a-zA-Z0-9-]+)\.org" ) {
set req.http.host = regsub( req.http.host,
"^([a-zA-Z0-9-]+)\.wap\.([a-zA-Z0-9-]+)\.org", "\1.mobile.\2.org");
}
--
To view, visit https://gerrit.wikimedia.org/r/47567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4788221afff60f5eeda3f5405cac8a7937bdcd47
Gerrit-PatchSet: 12
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
