jenkins-bot has submitted this change and it was merged.
Change subject: Fix redirect to HTTPS for ipv6
......................................................................
Fix redirect to HTTPS for ipv6
Not sure why default_server is not taking precedence here.
After this change wget -6 translatewiki.net loads the correct page.
Also not-so-sneakily dropping sandbox.translatewiki.net and harmonizing
listen syntax.
Change-Id: I8897ad04f27ffb5284c156c143ab0491bfcca834
---
M puppet/modules/awstats/files/stats.translatewiki.net
M puppet/modules/kitano-nl/files/kitano.nl
M puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
M puppet/modules/nginx/files/translatewiki.net
4 files changed, 5 insertions(+), 4 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 7cbcbc5..4bfb22c 100644
--- a/puppet/modules/awstats/files/stats.translatewiki.net
+++ b/puppet/modules/awstats/files/stats.translatewiki.net
@@ -1,7 +1,7 @@
# file managed by puppet
server {
- listen *:443 ssl spdy;
+ listen 443 ssl spdy;
listen [2a03:4000:6:55::1]:443 ssl spdy;
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
diff --git a/puppet/modules/kitano-nl/files/kitano.nl
b/puppet/modules/kitano-nl/files/kitano.nl
index 3c97d90..b7115a2 100644
--- a/puppet/modules/kitano-nl/files/kitano.nl
+++ b/puppet/modules/kitano-nl/files/kitano.nl
@@ -1,7 +1,7 @@
# file managed by puppet
server {
- listen *:80;
+ listen 80;
listen [2a03:4000:6:55::1]:80;
server_name .kitano.nl;
diff --git a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
index 09222ed..17af6ad 100644
--- a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
+++ b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
@@ -4,7 +4,7 @@
# http://people.adams.edu/~cdmiller/posts/Ubuntu-Mailman-Nginx-Fcgipass/
server {
- listen *:443 ssl spdy;
+ listen 443 ssl spdy;
listen [2a03:4000:6:55::2]:443 ssl spdy;
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
diff --git a/puppet/modules/nginx/files/translatewiki.net
b/puppet/modules/nginx/files/translatewiki.net
index 64945dd..4a1e212 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -3,6 +3,7 @@
server {
listen 80 default_server;
listen [2a03:4000:6:55::1]:80;
+ server_name translatewiki.net dev.translatewiki.net;
return 301 https://$host$request_uri;
}
@@ -32,7 +33,7 @@
spdy_headers_comp 7;
- server_name translatewiki.net dev.translatewiki.net
sandbox.translatewiki.net;
+ server_name translatewiki.net dev.translatewiki.net;
root /www/$host/docroot;
location = / {
--
To view, visit https://gerrit.wikimedia.org/r/212583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8897ad04f27ffb5284c156c143ab0491bfcca834
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Jeremyb <jer...@tuxmachine.com>
Gerrit-Reviewer: Jeremyb <jer...@tuxmachine.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
