jenkins-bot has submitted this change and it was merged.
Change subject: Changes for new nginx
......................................................................
Changes for new nginx
spdy replaced with http2
Change-Id: If766eb5e8794608791acc23353d23efc683df458
---
M puppet/modules/awstats/files/stats.translatewiki.net
M puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
M puppet/modules/nginx/files/offline
M puppet/modules/nginx/files/ssl.conf
M puppet/modules/nginx/files/translatewiki.net
5 files changed, 8 insertions(+), 12 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/awstats/files/stats.translatewiki.net
b/puppet/modules/awstats/files/stats.translatewiki.net
index 6066248..60cfd0e 100644
--- a/puppet/modules/awstats/files/stats.translatewiki.net
+++ b/puppet/modules/awstats/files/stats.translatewiki.net
@@ -1,8 +1,8 @@
# file managed by puppet
server {
- listen 443 ssl spdy;
- listen [2a03:4000:6:b01e::1]:443 ssl spdy;
+ listen 443 ssl http2;
+ listen [2a03:4000:6:b01e::1]:443 ssl http2;
include includes/ssl.conf;
diff --git a/puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
b/puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
index b348393..bd6320d 100644
--- a/puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
+++ b/puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
@@ -4,8 +4,8 @@
# http://people.adams.edu/~cdmiller/posts/Ubuntu-Mailman-Nginx-Fcgipass/
server {
- listen 443 ssl spdy;
- listen [2a03:4000:6:b01e::2]:443 ssl spdy;
+ listen 443 ssl http2;
+ listen [2a03:4000:6:b01e::2]:443 ssl http2;
include includes/ssl.conf;
diff --git a/puppet/modules/nginx/files/offline
b/puppet/modules/nginx/files/offline
index 92218bc..acad986 100644
--- a/puppet/modules/nginx/files/offline
+++ b/puppet/modules/nginx/files/offline
@@ -3,8 +3,8 @@
server {
listen 80 default_server;
listen [2a03:4000:6:55::1]:80;
- listen 443 ssl default_server spdy;
- listen [2a03:4000:6:55::1]:443 ssl spdy;
+ listen 443 ssl default_server http2;
+ listen [2a03:4000:6:55::1]:443 ssl http2;
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
ssl_certificate_key /etc/ssl/private/translatewiki.net.key;
@@ -15,8 +15,6 @@
ssl_ciphers "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384
EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH
EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS";
add_header Strict-Transport-Security "max-age=31536000";
-
- spdy_headers_comp 7;
server_name translatewiki.net dev.translatewiki.net;
root /www/offline;
diff --git a/puppet/modules/nginx/files/ssl.conf
b/puppet/modules/nginx/files/ssl.conf
index 0c007d2..f89f474 100644
--- a/puppet/modules/nginx/files/ssl.conf
+++ b/puppet/modules/nginx/files/ssl.conf
@@ -20,5 +20,3 @@
ssl_buffer_size 4k;
-spdy_headers_comp 7;
-
diff --git a/puppet/modules/nginx/files/translatewiki.net
b/puppet/modules/nginx/files/translatewiki.net
index 8f8c401..13ea191 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -8,8 +8,8 @@
}
server {
- listen 443 ssl default_server deferred spdy;
- listen [2a03:4000:6:b01e::1]:443 default_server deferred ssl spdy;
+ listen 443 ssl default_server deferred http2;
+ listen [2a03:4000:6:b01e::1]:443 default_server deferred ssl http2;
include includes/ssl.conf;
--
To view, visit https://gerrit.wikimedia.org/r/287251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If766eb5e8794608791acc23353d23efc683df458
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
