[MediaWiki-commits] [Gerrit] cache_text: do not rewrite zero.wm.o like a zero domain - change (operations/puppet)

2015-12-11 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: cache_text: do not rewrite zero.wm.o like a zero domain
..


cache_text: do not rewrite zero.wm.o like a zero domain

Change-Id: Ia7f650202b77cdd7ab325b21ce9cc38aae2383a0
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 9af55f8..961ad15 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -67,7 +67,7 @@
if (req.restarts == 0) {
// Always set or clear X-Subdomain
unset req.http.X-Subdomain;
-   if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\.") {
+   if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\." && 
req.http.host != "zero.wikimedia.org") {
set req.http.X-Subdomain = "ZERO";
} else if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?m\.") {
set req.http.X-Subdomain = "M";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7f650202b77cdd7ab325b21ce9cc38aae2383a0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] cache_text: do not rewrite zero.wm.o like a zero domain - change (operations/puppet)

2015-12-11 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: cache_text: do not rewrite zero.wm.o like a zero domain
..

cache_text: do not rewrite zero.wm.o like a zero domain

Change-Id: Ia7f650202b77cdd7ab325b21ce9cc38aae2383a0
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/258518/1

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 9af55f8..961ad15 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -67,7 +67,7 @@
if (req.restarts == 0) {
// Always set or clear X-Subdomain
unset req.http.X-Subdomain;
-   if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\.") {
+   if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\." && 
req.http.host != "zero.wikimedia.org") {
set req.http.X-Subdomain = "ZERO";
} else if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?m\.") {
set req.http.X-Subdomain = "M";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7f650202b77cdd7ab325b21ce9cc38aae2383a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

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