[MediaWiki-commits] [Gerrit] Moved 470-01 to unified, zero-only, https support - change (operations/puppet)

2014-09-24 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

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

Change subject: Moved 470-01 to unified, zero-only, https support
..

Moved 470-01 to unified, zero-only, https support

Change-Id: Ie99cdf396d1a80771f203701fc7c39555ee60b74
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/162770/1

diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index 90cc5ef..96721d2 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -150,7 +150,7 @@
 set req.http.X-CS = req.http.X-CS2;
 }
 }
-} else if (req.http.X-CS2 ~ ^(470-01|520-18)$) {
+} else if (req.http.X-CS2 ~ ^(520-18)$) {
 if ((!req.http.X-Forwarded-Proto  !req.http.X-Forwarded-By) || 
req.http.X-Forwarded-By == Opera) {
 if (req.http.X-Subdomain == ZERO) {
 // ZERO only, direct HTTP or opera
@@ -188,7 +188,7 @@
 } else {
 //
 // Each carrier migrated to the unified design must be moved to 
the vcl_deliver so that analytics stays current
-// Enabled: 
250-99,401-01,404-01,414-06,416-03,426-04,428-98,429-02,436-01,436-04,437-01,514-02,515-03,635-10,TESTON
+// Enabled: 
250-99,401-01,404-01,414-06,416-03,426-04,428-98,429-02,436-01,436-04,437-01,470-01,514-02,515-03,635-10,TESTON
 // Disabled: 
255-03,310-260,410-06,436-05,515-05,604-00,621-30,623-03,630-03,631-02
 //
 // TBD: Beware of legitimately formed links happening to have 
:ZeroRatedMobileAccess...
@@ -270,6 +270,13 @@
 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 == 470-01) {
+// These carriers support HTTPS for DIRECT and OPERA, but ZERO-only
+if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By == 
Opera) {
+if (req.http.X-Subdomain == ZERO) {
+set req.http.X-CS = req.http.X-CS2;
+}
+}
 } else if (req.http.X-CS2 ~ 
^(255-03|310-260|410-06|436-05|515-05|604-00|621-30|623-03|630-03|631-02|TESTON)(\|.*)?$)
 {
 // Support HTTPS, allows all proxies
 // Once analytics is fixed, this will be done for everything

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie99cdf396d1a80771f203701fc7c39555ee60b74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik yu...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Moved 470-01 to unified, zero-only, https support - change (operations/puppet)

2014-09-24 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: Moved 470-01 to unified, zero-only, https support
..


Moved 470-01 to unified, zero-only, https support

Change-Id: Ie99cdf396d1a80771f203701fc7c39555ee60b74
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 9 insertions(+), 2 deletions(-)

Approvals:
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index 90cc5ef..96721d2 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -150,7 +150,7 @@
 set req.http.X-CS = req.http.X-CS2;
 }
 }
-} else if (req.http.X-CS2 ~ ^(470-01|520-18)$) {
+} else if (req.http.X-CS2 ~ ^(520-18)$) {
 if ((!req.http.X-Forwarded-Proto  !req.http.X-Forwarded-By) || 
req.http.X-Forwarded-By == Opera) {
 if (req.http.X-Subdomain == ZERO) {
 // ZERO only, direct HTTP or opera
@@ -188,7 +188,7 @@
 } else {
 //
 // Each carrier migrated to the unified design must be moved to 
the vcl_deliver so that analytics stays current
-// Enabled: 
250-99,401-01,404-01,414-06,416-03,426-04,428-98,429-02,436-01,436-04,437-01,514-02,515-03,635-10,TESTON
+// Enabled: 
250-99,401-01,404-01,414-06,416-03,426-04,428-98,429-02,436-01,436-04,437-01,470-01,514-02,515-03,635-10,TESTON
 // Disabled: 
255-03,310-260,410-06,436-05,515-05,604-00,621-30,623-03,630-03,631-02
 //
 // TBD: Beware of legitimately formed links happening to have 
:ZeroRatedMobileAccess...
@@ -270,6 +270,13 @@
 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 == 470-01) {
+// These carriers support HTTPS for DIRECT and OPERA, but ZERO-only
+if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By == 
Opera) {
+if (req.http.X-Subdomain == ZERO) {
+set req.http.X-CS = req.http.X-CS2;
+}
+}
 } else if (req.http.X-CS2 ~ 
^(255-03|310-260|410-06|436-05|515-05|604-00|621-30|623-03|630-03|631-02|TESTON)(\|.*)?$)
 {
 // Support HTTPS, allows all proxies
 // Once analytics is fixed, this will be done for everything

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie99cdf396d1a80771f203701fc7c39555ee60b74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits