BBlack has submitted this change and it was merged.
Change subject: Revert "tlsproxy: let nginx use keepalives to varnish"
......................................................................
Revert "tlsproxy: let nginx use keepalives to varnish"
We've getting some sort of increased rate of upload.wm.o failures today, so
reverting this whole change to expediently check if it's the cause.
This reverts commit b1d9b7114041a6fbfbcc420ccac841860d4ef21a.
Change-Id: I05dfe9c93ff760042f4a02a20787999270d10eaa
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 1 insertion(+), 10 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/tlsproxy/templates/localssl.erb
b/modules/tlsproxy/templates/localssl.erb
index 4b7b17c..ed09074 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -1,13 +1,6 @@
# Proxy site configuration file for <%= @name %>
# This file is managed by Puppet!
-upstream local_fe {
- server <%= @ipaddress %>:<%= @upstream_port %>;
- # idle keepalive conns kept around is per worker process, which we
- # commonly have ~32-48 of!
- keepalive 4;
-}
-
# SSL proxying
server {
listen [::]:443 <%= @default_server ? "default_server reuseport
ipv6only=on " : "" %>ssl spdy;
@@ -30,9 +23,7 @@
keepalive_timeout 60;
location / {
- proxy_pass http://local_fe;
- proxy_http_version 1.1;
- proxy_set_header Connection "";
+ proxy_pass http://<%= @ipaddress %>:<%= @upstream_port %>;
# this should be in sync with Varnish's first_byte_timeout
# and PHP's max_execution_time
--
To view, visit https://gerrit.wikimedia.org/r/228882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05dfe9c93ff760042f4a02a20787999270d10eaa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
