BBlack has submitted this change and it was merged.

Change subject: r::c::ssl::unified: set explicit server name www.wikimedia.org
......................................................................


r::c::ssl::unified: set explicit server name www.wikimedia.org

If no Host header is present, nginx assumes the request hostname
is the server_name of the default_server, and our template in turn
defaults server_name to $fqdn, which is typically an internal,
private hostname.

Should set this to a meaningful public name in case it's ever used
in output (directly or indirectly) - especially if we're planning
to have nginx issue redirects in the future.

Bug: T107236
Change-Id: I6c697e1e2911d815d1a2520a1b8f93c8d9ce08eb
---
M modules/role/manifests/cache/ssl/unified.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/cache/ssl/unified.pp 
b/modules/role/manifests/cache/ssl/unified.pp
index 3136b4b..fc2d192 100644
--- a/modules/role/manifests/cache/ssl/unified.pp
+++ b/modules/role/manifests/cache/ssl/unified.pp
@@ -6,6 +6,7 @@
         }
 
         tlsproxy::localssl { 'unified':
+            server_name    => 'www.wikimedia.org',
             certs          => ['ecc-uni.wikimedia.org', 'uni.wikimedia.org'],
             default_server => true,
             do_ocsp        => true,
@@ -13,6 +14,7 @@
     }
     else {
         tlsproxy::localssl { 'unified':
+            server_name    => 'www.wikimedia.beta.wmflabs.org',
             certs          => ['star.wmflabs.org'],
             default_server => true,
             do_ocsp        => false,

-- 
To view, visit https://gerrit.wikimedia.org/r/294703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c697e1e2911d815d1a2520a1b8f93c8d9ce08eb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to