BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/323865 )
Change subject: tlsproxy: remove unused keepalives complexity
......................................................................
tlsproxy: remove unused keepalives complexity
Bug: T107749
Change-Id: I225376dda7e10b09057d45cbbbc5e87efd24f785
---
M modules/tlsproxy/manifests/instance.pp
M modules/tlsproxy/manifests/localssl.pp
M modules/tlsproxy/templates/localssl.erb
M modules/tlsproxy/templates/nginx.conf.erb
4 files changed, 0 insertions(+), 11 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index d4270b6..6312aa8 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -16,7 +16,6 @@
},
}
- $keepalives_per_worker =
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
$websocket_support = hiera('cache::websocket_support', false)
$nginx_worker_connections = '131072'
$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat')
diff --git a/modules/tlsproxy/manifests/localssl.pp
b/modules/tlsproxy/manifests/localssl.pp
index edf696a..e140fc6 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -63,7 +63,6 @@
require tlsproxy::instance
- $keepalives_per_worker =
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
$websocket_support = hiera('cache::websocket_support', false)
# Maximum number of pending TCP Fast Open requests before falling back to
# regular 3WHS. https://tools.ietf.org/html/rfc7413#section-5.1
diff --git a/modules/tlsproxy/templates/localssl.erb
b/modules/tlsproxy/templates/localssl.erb
index c9b2dee..1fdd231 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -4,9 +4,6 @@
<%- @upstream_ports.each do |upstream_port| -%>
server <%= @ipaddress %>:<%= upstream_port %> max_fails=0;
<%- end -%>
-<% if @keepalives_per_worker.to_i > 0 -%>
- keepalive <%= @keepalives_per_worker %>; # Note: commonly up to 48 workers!
-<% end -%>
}
# SSL proxying
@@ -48,8 +45,6 @@
<% if @websocket_support -%>
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
-<% elsif @keepalives_per_worker.to_i > 0 -%>
- proxy_set_header Connection "";
<% end -%>
# this should be in sync with Varnish's first_byte_timeout
diff --git a/modules/tlsproxy/templates/nginx.conf.erb
b/modules/tlsproxy/templates/nginx.conf.erb
index b8c07f5..d57495d 100644
--- a/modules/tlsproxy/templates/nginx.conf.erb
+++ b/modules/tlsproxy/templates/nginx.conf.erb
@@ -119,11 +119,7 @@
<% if @websocket_support -%>
map $http_upgrade $connection_upgrade {
default upgrade;
-<% if @keepalives_per_worker.to_i > 0 -%>
- '' '';
-<% else -%>
'' close;
-<% end -%>
}
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/323865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I225376dda7e10b09057d45cbbbc5e87efd24f785
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
