Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/220074
Change subject: HTTPS role should set wgAssumeProxiesUseDefaultProtocolPorts to false ...................................................................... HTTPS role should set wgAssumeProxiesUseDefaultProtocolPorts to false In vagrant's case, the external port matches the internal one, and it's non-standard (4430) Bug: T75510 Change-Id: Idf4db335317d37e215d239a2016521694290ae55 --- M puppet/modules/role/manifests/https.pp 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/74/220074/1 diff --git a/puppet/modules/role/manifests/https.pp b/puppet/modules/role/manifests/https.pp index 14c33eb..3455ec7 100644 --- a/puppet/modules/role/manifests/https.pp +++ b/puppet/modules/role/manifests/https.pp @@ -15,11 +15,17 @@ notify => Service['nginx'], } - # enable secure login mediawiki::settings { 'SSL-related settings': values => { 'wgSecureLogin' => true, 'wgHttpsPort' => 4430, + 'wgAssumeProxiesUseDefaultProtocolPorts' => false, } } + + mediawiki::settings { 'Redeclaring wgServer to take wgAssumeProxiesUseDefaultProtocolPorts into account': + values => [ + '$wgServer = WebRequest::detectServer();', + ], + } } -- To view, visit https://gerrit.wikimedia.org/r/220074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf4db335317d37e215d239a2016521694290ae55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits