[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enabling OAuth on foundationwiki

2017-08-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370310 )

Change subject: Enabling OAuth on foundationwiki
..


Enabling OAuth on foundationwiki

Bug: T170301
Change-Id: I6c1193e3f1f7df7d10c79c1da2473d10adcb2332
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ae72c43..7598a4b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3315,8 +3315,9 @@
 
 if ( $wmgUseOAuth ) {
wfLoadExtension( 'OAuth' );
-   if ( in_array( $wgDBname, [ 'labswiki', 'labtestwiki' ] ) ) {
+   if ( in_array( $wgDBname, [ 'labswiki', 'labtestwiki', 'foundationwiki' 
] ) ) {
// Wikitech and its testing variant use local OAuth tables
+   // WMF wiki uses OAuth tables of its own - T170301
$wgMWOAuthCentralWiki = false;
} else {
$wgMWOAuthCentralWiki = 'metawiki';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 0fe874d..0fab1d3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9938,7 +9938,7 @@
],
'+foundationwiki' => [
'sysop' => [ 'inactive', 'flood' ],
-   'bureaucrat' => [ 'import', 'transwiki', 'inactive', 
'petitiondata' ],
+   'bureaucrat' => [ 'import', 'transwiki', 'inactive', 
'petitiondata', 'oauthadmin' ],
],
'+frwiki' => [
'sysop' => [ 'rollbacker' ], // T170780
@@ -10681,7 +10681,7 @@
],
'+foundationwiki' => [
'sysop' => [ 'inactive', 'confirmed', 'flood' ],
-   'bureaucrat' => [ 'sysop', 'bureaucrat', 'import', 'transwiki', 
'inactive', 'confirmed', 'petitiondata' ],
+   'bureaucrat' => [ 'sysop', 'bureaucrat', 'import', 'transwiki', 
'inactive', 'confirmed', 'petitiondata', 'oauthadmin' ],
],
'+frwiki' => [
'sysop' => [ 'rollbacker' ], // T170780
@@ -12512,6 +12512,7 @@
'default' => true,
'private' => false,
'fishbowl' => false,
+   'foundationwiki' => true, // T170301
 ],
 
 # @}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c1193e3f1f7df7d10c79c1da2473d10adcb2332
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enabling OAuth on foundationwiki

2017-08-05 Thread MarcoAurelio (Code Review) 
MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370310 )

Change subject: Enabling OAuth on foundationwiki
..

Enabling OAuth on foundationwiki

Bug: T170301
Change-Id: I6c1193e3f1f7df7d10c79c1da2473d10adcb2332
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/10/370310/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 32e6f83..8cec77f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3315,8 +3315,9 @@
 
 if ( $wmgUseOAuth ) {
wfLoadExtension( 'OAuth' );
-   if ( in_array( $wgDBname, [ 'labswiki', 'labtestwiki' ] ) ) {
+   if ( in_array( $wgDBname, [ 'labswiki', 'labtestwiki', 'foundationwiki' 
] ) ) {
// Wikitech and its testing variant use local OAuth tables
+   // WMF wiki uses OAuth tables of its own - T170301
$wgMWOAuthCentralWiki = false;
} else {
$wgMWOAuthCentralWiki = 'metawiki';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bea92dc..43b71c9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12510,6 +12510,7 @@
'default' => true,
'private' => false,
'fishbowl' => false,
+   'foundationwiki' => true, // T170301
 ],
 
 # @}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c1193e3f1f7df7d10c79c1da2473d10adcb2332
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits