From: Tom Hughes <tom@compton.nu>
Date: Mon, 18 Feb 2019 18:19:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/219'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/fda7ee22b72154e9c8c04cb7ec3f3a08d119b50a?hp=f98d656899137e93216190bcc6613e15607c987c

Merge remote-tracking branch 'github/pull/219'
---

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 94ffead99..f5a3ea460 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -25,6 +25,7 @@ $wgScriptExtension  = ".php";
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "//<%= @name %>";
 $wgInternalServer   = 'https://<%= @name %>';
+$wgCanonicalServer  = 'https://<%= @name %>';
 
 $wgSecureLogin = true;
 $wgDefaultUserOptions['prefershttps'] = 1;