Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155783
Change subject: Zero: Switched 515-03 to ip-based unified
......................................................................
Zero: Switched 515-03 to ip-based unified
Change-Id: I5d3bb7d9867d125bd7964ba824fc7eaa2272dd8b
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/155783/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index b017a7f..333e947 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -197,10 +197,6 @@
set req.http.X-ZeroTLS = "1";
set req.http.X-CS = req.http.X-CS2;
}
- } else if (req.http.X-CS2 == "515-03") {
- if (!req.http.X-Forwarded-Proto && (!req.http.X-Forwarded-By ||
req.http.X-Forwarded-By == "Opera")) {
- set req.http.X-CS = req.http.X-CS2;
- }
} else if (req.http.X-CS2 == "635-10") {
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
@@ -232,7 +228,7 @@
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
- } else if (req.http.X-CS2 ~
"^(250-99|401-01|426-04|436-01|436-04|437-01|631-02|TESTON)(\|.*)?$") {
+ } else if (req.http.X-CS2 ~
"^(250-99|401-01|426-04|436-01|436-04|437-01|515-03|631-02|TESTON)(\|.*)?$") {
//
// Each carrier migrated to the unified design must be moved to
the vcl_deliver so that analytics stays current
//
@@ -323,7 +319,7 @@
// Once analytics is fixed, this will be done for everything
set req.http.X-CS = req.http.X-CS2;
} else if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
"Opera") {
- // Default: Support HTTPS for both DIRECT and OPERA (401-01,
437-01), allows all subnets
+ // Default: Support HTTPS for both DIRECT and OPERA (401-01,
437-01, 515-03), allows all subnets
set req.http.X-CS = req.http.X-CS2;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/155783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d3bb7d9867d125bd7964ba824fc7eaa2272dd8b
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
