Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65561
Change subject: Varnish: fix wikimedia.vcl.erb's std.collect()
......................................................................
Varnish: fix wikimedia.vcl.erb's std.collect()
Breakage introduced with I0bf908; import std to use std.collect(). Also
make this run only on frontends for efficiency.
Change-Id: I868bf1a8c12b64e1f76565d302cc0ba9f7a6df0d
---
M manifests/role/cache.pp
M templates/varnish/wikimedia.vcl.erb
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/65561/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 10a5092..3644c95 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -447,6 +447,7 @@
'cache4xx' => "1m",
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
'cluster_tier' => $cluster_tier,
+ 'layer' => 'backend',
},
backend_options => [
{
@@ -479,6 +480,7 @@
'cache4xx' => "1m",
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
'cluster_tier' => $cluster_tier,
+ 'layer' => 'frontend',
},
backend_options => [
{
@@ -600,6 +602,7 @@
'cache4xx' => "1m",
'purge_regex' =>
'^http://upload\.wikimedia\.org/',
'cluster_tier' => $cluster_tier,
+ 'layer' => 'backend',
},
backend_options => [
{
@@ -636,6 +639,7 @@
'cache4xx' => "1m",
'purge_regex' =>
'^http://upload\.wikimedia\.org/',
'cluster_tier' => $cluster_tier,
+ 'layer' => 'frontend',
},
backend_options => [
{
@@ -736,6 +740,7 @@
vcl_config => {
'retry5xx' => 1,
'cache4xx' => "1m",
+ 'layer' => 'frontend',
},
backend_options => {
'port' => 80,
@@ -837,6 +842,7 @@
vcl_config => {
'retry5xx' => 1,
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
+ 'layer' => 'backend',
},
backend_options => [
{
@@ -868,6 +874,7 @@
vcl_config => {
'retry5xx' => 0,
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
+ 'layer' => 'frontend',
},
backend_options => {
'port' => 81,
diff --git a/templates/varnish/wikimedia.vcl.erb
b/templates/varnish/wikimedia.vcl.erb
index bdc0f10..6556944 100644
--- a/templates/varnish/wikimedia.vcl.erb
+++ b/templates/varnish/wikimedia.vcl.erb
@@ -1,5 +1,8 @@
# Wikimedia VCL file for <%= scope.lookupvar("::fqdn") %>, site <%=
scope.lookupvar("::site") %>
# This file is managed by Puppet!
+
+import std;
+
<%
def backend_option(backend, option, default)
if varnish_backend_options.kind_of?(Array)
@@ -257,8 +260,10 @@
}
sub vcl_deliver {
+<% if vcl_config.fetch("layer", "") == "frontend" -%>
std.collect(resp.http.Via);
std.collect(resp.http.X-Varnish);
+<% end -%>
if (resp.http.X-Cache) {
if (obj.hits > 0) {
--
To view, visit https://gerrit.wikimedia.org/r/65561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I868bf1a8c12b64e1f76565d302cc0ba9f7a6df0d
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
