Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131045
Change subject: blog: fix varnish configuration to handle the load
......................................................................
blog: fix varnish configuration to handle the load
maxconnections 100 is too low, considering Apache can handle much more
than that. Raise it to 256.
Additionally, the Varnish config reload was failing because of
referencing an undeclared ACL, ssl_proxies. Fix that in the main Varnish
config by removing an if block and defining the ACL, even if it's empty.
Change-Id: I42f3f2bc6eb6b3e4ab66875072a170752b6280e8
---
M manifests/misc/blogs.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/131045/1
diff --git a/manifests/misc/blogs.pp b/manifests/misc/blogs.pp
index a980875..8ad416f 100644
--- a/manifests/misc/blogs.pp
+++ b/manifests/misc/blogs.pp
@@ -61,7 +61,7 @@
'connect_timeout' => '5s',
'first_byte_timeout' => '35s',
'between_bytes_timeout' => '4s',
- 'max_connections' => 100,
+ 'max_connections' => 256,
'probe' => 'blog',
},
}
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 35b7470..9b4db0d 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -41,7 +41,6 @@
}
<% end -%>
-<% if ! @vcl_config.fetch("ssl_proxies", []).empty? -%>
acl ssl_proxies {
<% @vcl_config.fetch("ssl_proxies", []).each do |entry|
subnet, mask = entry.split("/", 2)
@@ -49,7 +48,6 @@
"<%= subnet %>"/<%= mask %>;
<% end -%>
}
-<% end -%>
# Backend probes
--
To view, visit https://gerrit.wikimedia.org/r/131045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f3f2bc6eb6b3e4ab66875072a170752b6280e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
