BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187328
Change subject: SPDY for Jessie
......................................................................
SPDY for Jessie
Change-Id: Ia5f42905c383f789cd6bc427d73675c4fc7abe4c
---
M modules/protoproxy/manifests/localssl.pp
M modules/protoproxy/templates/localssl.erb
2 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/187328/1
diff --git a/modules/protoproxy/manifests/localssl.pp
b/modules/protoproxy/manifests/localssl.pp
index 8ed333c..f8db79c 100644
--- a/modules/protoproxy/manifests/localssl.pp
+++ b/modules/protoproxy/manifests/localssl.pp
@@ -35,6 +35,14 @@
}
}
+ # for localssl.erb below
+ if os_version('debian >= jessie') {
+ $ssl_protos = 'ssl spdy';
+ }
+ else {
+ $ssl_protos = 'ssl';
+ }
+
nginx::site { $name:
require => Notify['protoproxy localssl default_server'], # Ensure a
default_server has been defined
content => template('protoproxy/localssl.erb')
diff --git a/modules/protoproxy/templates/localssl.erb
b/modules/protoproxy/templates/localssl.erb
index f27f0ae..ac7edff 100644
--- a/modules/protoproxy/templates/localssl.erb
+++ b/modules/protoproxy/templates/localssl.erb
@@ -3,8 +3,8 @@
# SSL proxying
server {
- listen [::]:443 <%= @default_server ? "default_server ipv6only=on " :
"" %>ssl;
- listen 443 <%= @default_server ? "default_server " : "" %>ssl;
+ listen [::]:443 <%= @default_server ? "default_server ipv6only=on " :
"" %><%= @ssl_protos %>;
+ listen 443 <%= @default_server ? "default_server " : "" %>ssl<%=
@ssl_protos %>;
ssl on;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
--
To view, visit https://gerrit.wikimedia.org/r/187328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5f42905c383f789cd6bc427d73675c4fc7abe4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
