jenkins-bot has submitted this change and it was merged. Change subject: LABS: set zerobanner to use lab's zerowiki ......................................................................
LABS: set zerobanner to use lab's zerowiki * Switched URL to http://zero.wikimedia.beta.wmflabs.org/w/api.php * Added the code needed to switch from ZRMA to ZeroPortal on zerowiki * The actual switch is still off, pending extension patches Change-Id: I12ef65bdb3e119bac566f792e7d2019661c3b906 --- M wmf-config/InitialiseSettings-labs.php M wmf-config/mobile-labs.php 2 files changed, 33 insertions(+), 10 deletions(-) Approvals: Yurik: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 725c51a..50b469a 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -220,7 +220,7 @@ ), '-wmgZeroRatedMobileAccess' => array( 'default' => false, - 'zerowiki' => true, + 'zerowiki' => true, // Will be replaced by wmgZeroPortal ), '-wmgZeroBanner' => array( 'default' => false, @@ -228,6 +228,10 @@ 'wiki' => true, 'zerowiki' => false, ), + '-wmgZeroPortal' => array( + 'default' => false, + 'zerowiki' => false, // Will replace wmgZeroRatedMobileAccess + ), 'wmgMFPhotoUploadEndpoint' => array( 'default' => '//commons.wikimedia.$variant.wmflabs.org/w/api.php', ), diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php index f179ca5..d0aaf2c 100644 --- a/wmf-config/mobile-labs.php +++ b/wmf-config/mobile-labs.php @@ -7,27 +7,46 @@ require_once( __DIR__ . '/mobile.php' ); if ( $wmgMobileFrontend ) { - if ( $wmgZeroBanner ) { + if ( $wmgZeroBanner && !$wmgZeroPortal ) { require_once( "$IP/extensions/JsonConfig/JsonConfig.php" ); require_once( "$IP/extensions/ZeroBanner/ZeroBanner.php" ); + + $wgZeroEnableTesting = true; // BETA ONLY! + $wgJsonConfigs['JsonZeroConfig'] = array( 'namespace' => NS_ZERO, 'nsname' => 'Zero', 'islocal' => false, - 'url' => 'https://zero.wikimedia.org/w/api.php', - 'username' => $wmgZeroRatedMobileAccessApiUserName, - 'password' => $wmgZeroRatedMobileAccessApiPassword, + 'url' => 'http://zero.wikimedia.beta.wmflabs.org/w/api.php', + 'username' => $wmgZeroPortalApiUserName, + 'password' => $wmgZeroPortalApiPassword, ); + unset( $wgGroupPermissions['zeroadmin'] ); + unset( $wgGroupPermissions['zeroscript'] ); + unset( $wgGroupPermissions['zeroscriptips'] ); + } + if ( $wmgZeroPortal && $wmgZeroBanner ) { + require_once( "$IP/extensions/JsonConfig/JsonConfig.php" ); + require_once( "$IP/extensions/ZeroBanner/ZeroBanner.php" ); + require_once( "$IP/extensions/ZeroPortal/ZeroPortal.php" ); + + $wgZeroEnableTesting = true; // BETA ONLY! + + $wgJsonConfigs['JsonZeroConfig'] = array( + 'namespace' => NS_ZERO, + 'nsname' => 'Zero', + 'islocal' => true, + ); + $wgGroupPermissions['zeroadmin']['zero-edit'] = true; + $wgGroupPermissions['zeroadmin']['zero-script'] = true; + $wgGroupPermissions['zeroadmin']['zero-script-ips'] = true; + $wgGroupPermissions['zeroscript']['zero-script'] = true; + $wgGroupPermissions['zeroscriptips']['zero-script-ips'] = true; } } $wgMFForceSecureLogin = false; $wgMFUseCentralAuthToken = $wmgMFUseCentralAuthToken; - -// Zero extension -$wgEnableZeroRatedMobileAccessTesting = true; // Delete once ZRMA extension is removed -$wgZeroEnableTesting = true; - // Keep Going experiments $wgMFKeepGoing = true; -- To view, visit https://gerrit.wikimedia.org/r/137892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12ef65bdb3e119bac566f792e7d2019661c3b906 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Yurik <yu...@wikimedia.org> Gerrit-Reviewer: Yurik <yu...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
