Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149310
Change subject: Moved 250-99 to unified config
......................................................................
Moved 250-99 to unified config
Change-Id: Ieeb940b27d75e73ce54ad0ab74ac9b72cdfbb881
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/149310/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 3d0ced3..a90308e 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -169,12 +169,6 @@
set req.http.X-CS = req.http.X-CS2;
}
}
- } else if (req.http.X-CS2 == "250-99") {
- if (!req.http.X-Forwarded-Proto &&
(!req.http.X-Forwarded-By || req.http.X-Forwarded-By == "Opera")) {
- if (req.http.host ~ "^((ru|en)\.)?(zero|m)\.") {
- set req.http.X-CS = req.http.X-CS2;
- }
- }
} else if (req.http.X-CS2 == "410-01") {
if (!req.http.X-Forwarded-Proto &&
(!req.http.X-Forwarded-By || req.http.X-Forwarded-By == "Opera")) {
if (req.http.host ~ "^((en|ur)\.)?(zero|m)\.") {
@@ -244,6 +238,7 @@
}
}
} else if (req.http.X-CS2 == "426-04" ||
+ req.http.X-CS2 == "250-99" ||
req.http.X-CS2 ~ "^TESTON.*") {
//
// Each carrier migrated to the unified design must be
moved to the vcl_deliver so that analytics stays current
@@ -270,7 +265,7 @@
unset req.http.X-ZeroTLS;
}
} // end of if(X-CS2)
- if ( req.http.X-Forwarded-By ) {
+ if (req.http.X-Forwarded-By) {
// Current backend & cache vary on X-Forwarded-By, so in order
not to fragment cache,
// unset X-Forwarded-By. We still need that value in the
resulting X-Analytics header,
// so create a copy to be used in the vcl_deliver.
@@ -324,6 +319,12 @@
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
+ } else if (req.http.X-CS2 == "250-99") {
+ if (!req.http.X-Forwarded-Proto &&
(!req.http.X-Forwarded-By || req.http.X-Forwarded-By == "Opera")) {
+ if (req.http.host ~
"^((ru|en)\.)?(zero|m)\.") {
+ set req.http.X-CS =
req.http.X-CS2;
+ }
+ }
} else {
set req.http.X-CS = req.http.X-CS2;
}
--
To view, visit https://gerrit.wikimedia.org/r/149310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeb940b27d75e73ce54ad0ab74ac9b72cdfbb881
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
