[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Expose Thumbor swift username

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

Change subject: Expose Thumbor swift username
..


Expose Thumbor swift username

Bug: T144479
Depens-On: I0f81a013ec994eee3f156a89f29f4fcfc37c42b7
Change-Id: I5d30d79cbbb97daf24890c3472d912eb041e6511
---
M wmf-config/filebackend.php
1 file changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index d6c92f8..a26920b 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -53,7 +53,9 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'readUsers'   => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
+   'writeUsers'  => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ]
];
$wgFileBackends[] = [ // backend config for wiki's access to shared repo
'class'  => 'SwiftFileBackend',
@@ -78,7 +80,9 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'readUsers'   => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
+   'writeUsers'  => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ]
];
$wgFileBackends[] = [ // backend config for wiki's access to shared 
files
'class'  => 'SwiftFileBackend',
@@ -96,7 +100,9 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'readUsers'   => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
+   'writeUsers'  => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ]
];
$wgFileBackends[] = [ // backend config for wiki's access to shared 
test repo
'class'  => 'SwiftFileBackend',
@@ -111,7 +117,9 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'readUsers'   => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
+   'writeUsers'  => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ]
];
 }
 /* end DC-specific Swift backend config */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d30d79cbbb97daf24890c3472d912eb041e6511
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Urbanecm 
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]: Expose Thumbor swift username

2017-09-05 Thread Gilles (Code Review) 
Gilles has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376043 )

Change subject: Expose Thumbor swift username
..

Expose Thumbor swift username

Bug: T144479
Change-Id: I5d30d79cbbb97daf24890c3472d912eb041e6511
---
M wmf-config/filebackend.php
1 file changed, 8 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index d6c92f8..280edbb 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -53,7 +53,8 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'thumborUser'=> 
$wmfSwiftConfig[$specificDC]['thumborUser']
];
$wgFileBackends[] = [ // backend config for wiki's access to shared repo
'class'  => 'SwiftFileBackend',
@@ -78,7 +79,8 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'thumborUser'=> 
$wmfSwiftConfig[$specificDC]['thumborUser']
];
$wgFileBackends[] = [ // backend config for wiki's access to shared 
files
'class'  => 'SwiftFileBackend',
@@ -96,7 +98,8 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'thumborUser'=> 
$wmfSwiftConfig[$specificDC]['thumborUser']
];
$wgFileBackends[] = [ // backend config for wiki's access to shared 
test repo
'class'  => 'SwiftFileBackend',
@@ -111,7 +114,8 @@
'parallelize'=> 'implicit',
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
-   'readAffinity'   => ( $specificDC === $wmfDatacenter )
+   'readAffinity'   => ( $specificDC === $wmfDatacenter ),
+   'thumborUser'=> 
$wmfSwiftConfig[$specificDC]['thumborUser']
];
 }
 /* end DC-specific Swift backend config */

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

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

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