Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/49925
Change subject: Fix test.m.wikipedia.org
......................................................................
Fix test.m.wikipedia.org
srv193 doesn't listen on port 81, manually define the backend instead of
trying to do it the structured right way.
Change-Id: I613cff2d66443ce6108080e93bc2ff38c7fbeccd
---
M manifests/role/cache.pp
M templates/varnish/mobile-frontend.inc.vcl.erb
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/49925/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index c01bc38..90a51b8 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -651,7 +651,6 @@
admin_port => 6082,
directors => {
"backend" =>
$::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site],
- "test_wikipedia" =>
$::role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
director_options => {
'retries' => 40,
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index a0e6aa1..ee3a5ad 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -232,6 +232,16 @@
"202.152.243.0"/24;
}
+# for test.* routing, FIXME
+backend test_wikipedia {
+ .host = "srv193.pmtpa.wmnet";
+ .port = "80";
+ .connect_timeout = 5s;
+ .first_byte_timeout = 35s;
+ .between_bytes_timeout = 2s;
+ .max_connections = 20;
+}
+
sub tag_carrier {
/* For wiki zero project - tags partnered carriers
--
To view, visit https://gerrit.wikimedia.org/r/49925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I613cff2d66443ce6108080e93bc2ff38c7fbeccd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
