BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222065
Change subject: tlsproxy: kill $ssl_protos var
......................................................................
tlsproxy: kill $ssl_protos var
Change-Id: Ia6a164922b290a3c0ec03839eb8adf3e6f274e6c
---
M modules/tlsproxy/manifests/localssl.pp
M modules/tlsproxy/templates/localssl.erb
2 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/222065/1
diff --git a/modules/tlsproxy/manifests/localssl.pp
b/modules/tlsproxy/manifests/localssl.pp
index ec1ef24..b581178 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -48,9 +48,6 @@
}
}
- # for localssl.erb below
- $ssl_protos = 'ssl spdy'
-
if $do_ocsp {
include ::tlsproxy::ocsp_updater
diff --git a/modules/tlsproxy/templates/localssl.erb
b/modules/tlsproxy/templates/localssl.erb
index 0915212..b83e894 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -3,8 +3,8 @@
# SSL proxying
server {
- listen [::]:443 <%= @default_server ? "default_server reuseport
ipv6only=on " : "" %><%= @ssl_protos %>;
- listen 443 <%= @default_server ? "default_server reuseport " : "" %><%=
@ssl_protos %>;
+ listen [::]:443 <%= @default_server ? "default_server reuseport
ipv6only=on " : "" %> ssl spdy;
+ listen 443 <%= @default_server ? "default_server reuseport " : "" %>
ssl spdy;
ssl on;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
--
To view, visit https://gerrit.wikimedia.org/r/222065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6a164922b290a3c0ec03839eb8adf3e6f274e6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
