Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249794
Change subject: beta: Use SSL to connect to restbase where necessary
......................................................................
beta: Use SSL to connect to restbase where necessary
Change-Id: I5fc792bdff350225bffcaaf7d4baddcd2906c9da
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/94/249794/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e380ea0..1796a10 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1948,9 +1948,12 @@
// so use a hook
$wgExtensionFunctions[] = function () {
global $wgServerName, $wgVisualEditorRestbaseURL,
$wmfRealm;
- if ( $wmfRealm === 'production' ) {
+ if (
+ $wmfRealm === 'production' ||
+ ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] )
&& $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' )
+ ) {
$wgVisualEditorRestbaseURL =
"https://$wgServerName/api/rest_v1/page/html/";;
- } elseif ( $wmfRealm === 'labs' ) {
+ } else {
$wgVisualEditorRestbaseURL =
"http://$wgServerName/api/rest_v1/page/html/";;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/249794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fc792bdff350225bffcaaf7d4baddcd2906c9da
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
