jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up I32bfdd14: Fix beta to contact restbase on http
rather than https
......................................................................
Follow-up I32bfdd14: Fix beta to contact restbase on http rather than https
No https for beta :(
Change-Id: Icf349d9a01c8784c6219be1aafe60a82b13ef3f5
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1620cad..9874348 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1976,8 +1976,12 @@
// HACK: $wgServerName is not available yet at this point, it's
set by Setup.php
// so use a hook
$wgExtensionFunctions[] = function () {
- global $wgServerName, $wgVisualEditorRestbaseURL;
- $wgVisualEditorRestbaseURL =
"https://$wgServerName/api/rest_v1/page/html/";;
+ global $wgServerName, $wgVisualEditorRestbaseURL,
$wmfRealm;
+ if ( $wmfRealm === 'production' ) {
+ $wgVisualEditorRestbaseURL =
"https://$wgServerName/api/rest_v1/page/html/";;
+ } elseif ( $wmfRealm === 'labs' ) {
+ $wgVisualEditorRestbaseURL =
"http://$wgServerName/api/rest_v1/page/html/";;
+ }
};
}
--
To view, visit https://gerrit.wikimedia.org/r/234450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf349d9a01c8784c6219be1aafe60a82b13ef3f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
