jenkins-bot has submitted this change and it was merged.

Change subject: Custom rights on zerowiki
......................................................................


Custom rights on zerowiki

Change-Id: Ibb73998b985608ebabcb28ab3b9ebd028d3ed125
---
M wmf-config/CommonSettings.php
1 file changed, 12 insertions(+), 2 deletions(-)

Approvals:
  MaxSem: Looks good to me, but someone else must approve
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ca582ff..4804403 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2694,17 +2694,27 @@
        require_once( "$IP/extensions/ZeroBanner/ZeroBanner.php" );
        require_once( "$IP/extensions/ZeroPortal/ZeroPortal.php" );
 
-       // 2014-7-1 this line can be deleted once ZeroPortal goes into prod - 
redundant
-       $wgJsonConfigs['JsonZeroConfig']['store'] = true;
+       // zerowiki treats all logged-in users the same as anonymous, without 
giving them any extra rights
+       // Only sysops and scripts get additional rights on zerowiki
+       $zpUserRights = $wgGroupPermissions['user'];
+       $wgGroupPermissions['sysop'] = $wgGroupPermissions['sysop'] + 
$zpUserRights;
+       $wgGroupPermissions['user'] = $wgGroupPermissions['*'];
 
        $wgGroupPermissions['zeroadmin']['zero-edit'] = true;
        $wgGroupPermissions['zeroadmin']['zero-script'] = true;
        $wgGroupPermissions['zeroadmin']['zero-script-ips'] = true;
        $wgGroupPermissions['zeroadmin']['jsonconfig-flush'] = true;
+       $wgGroupPermissions['zeroadmin'] = $wgGroupPermissions['zeroadmin'] + 
$zpUserRights;
+
        $wgGroupPermissions['zeroscript']['zero-script'] = true;
        $wgGroupPermissions['zeroscript']['jsonconfig-flush'] = true;
+       $wgGroupPermissions['zeroscript'] = $wgGroupPermissions['zeroscript'] + 
$zpUserRights;
+
        $wgGroupPermissions['zeroscriptips']['zero-script-ips'] = true;
        $wgGroupPermissions['zeroscriptips']['jsonconfig-flush'] = true;
+       $wgGroupPermissions['zeroscriptips'] = 
$wgGroupPermissions['zeroscriptips'] + $zpUserRights;
+
+       unset( $zpUserRights );
 }
 
 if ( $wmgUseGraph ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/159517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb73998b985608ebabcb28ab3b9ebd028d3ed125
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to