jenkins-bot has submitted this change and it was merged.
Change subject: Add MEDIAWIKI_DBLIST_DIR define, set to MEDIAWIKI_STAGING_DIR
by default
......................................................................
Add MEDIAWIKI_DBLIST_DIR define, set to MEDIAWIKI_STAGING_DIR by default
To allow us to migrate dblist files to dblists/ in one swoop.
Change-Id: Ib908b844d31d16f843364615644de41b81ea3d33
---
M multiversion/MWWikiversions.php
M multiversion/defines.php
M multiversion/refreshWikiversionsCDB
M multiversion/updateWikiversions.php
M refresh-dblist
M wmf-config/CommonSettings.php
M wmf-config/Wikibase.php
M wmf-config/wgConf.php
8 files changed, 26 insertions(+), 19 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index a8e173a..f10a631 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -91,12 +91,18 @@
*/
public static function readDbListFile( $srcPath ) {
$flags = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
- $lines = @file( $srcPath, $flags );
// Provide a means of migrating dblist files to `dblists/`
// by checking both `/foo/bar.dblist` and
`/foo/dblists/bar.dblist`.
- if ( !$lines ) {
- $lines = @file( self::getAlternatePath( $srcPath ),
$flags );
+ foreach ( array(
+ $srcPath,
+ MEDIAWIKI_DBLIST_DIR . '/' . basename( $srcPath ),
+ self::getAlternatePath( $srcPath ),
+ ) as $path ) {
+ $lines = @file( $srcPath, $flags );
+ if ( $lines ) {
+ break;
+ }
}
if ( !$lines ) {
diff --git a/multiversion/defines.php b/multiversion/defines.php
index 8bba5b0..c90464e 100644
--- a/multiversion/defines.php
+++ b/multiversion/defines.php
@@ -3,6 +3,7 @@
* Define installation specific MWMultiVersion values like paths
*/
define( 'MEDIAWIKI_STAGING_DIR', '/srv/mediawiki-staging' );
+define( 'MEDIAWIKI_DBLIST_DIR', '/srv/mediawiki-staging' );
define( 'MEDIAWIKI_DEPLOYMENT_DIR', '/srv/mediawiki' );
define( 'MEDIAWIKI_VERSION_REGEX', '(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)');
-define( 'MEDIAWIKI_DIRECTORY_REGEX', '/^php-'.MEDIAWIKI_VERSION_REGEX.'$/');
\ No newline at end of file
+define( 'MEDIAWIKI_DIRECTORY_REGEX', '/^php-'.MEDIAWIKI_VERSION_REGEX.'$/');
diff --git a/multiversion/refreshWikiversionsCDB
b/multiversion/refreshWikiversionsCDB
index d49b5a4..e39d946 100755
--- a/multiversion/refreshWikiversionsCDB
+++ b/multiversion/refreshWikiversionsCDB
@@ -40,7 +40,7 @@
}
}
- $dbNames = MWWikiversions::readDbListFile( getRealmSpecificFilename(
MEDIAWIKI_STAGING_DIR . '/all.dblist' ) );
+ $dbNames = MWWikiversions::readDbListFile( getRealmSpecificFilename(
MEDIAWIKI_DBLIST_DIR . '/all.dblist' ) );
$diff = array_diff( $dbNames, array_keys( $rows ) );
if ( count( $diff ) ) {
print_r( $diff );
diff --git a/multiversion/updateWikiversions.php
b/multiversion/updateWikiversions.php
index 2f5bb9e..40d7e89 100644
--- a/multiversion/updateWikiversions.php
+++ b/multiversion/updateWikiversions.php
@@ -30,7 +30,7 @@
}
$dbListName = basename( $argv[1], '.dblist' );
- $dbList = MWWikiversions::readDbListFile( "$common/$dbListName.dblist"
);
+ $dbList = MWWikiversions::readDbListFile( MEDIAWIKI_DBLIST_DIR .
"/$dbListName.dblist" );
$newVersion = $argv[2];
if ( !preg_match( MEDIAWIKI_DIRECTORY_REGEX, $newVersion ) || !is_dir(
"$common/$newVersion" ) ) {
diff --git a/refresh-dblist b/refresh-dblist
index c766dad..988bbb2 100755
--- a/refresh-dblist
+++ b/refresh-dblist
@@ -36,14 +36,14 @@
$base = MEDIAWIKI_STAGING_DIR;
$defaultCluster = 's3';
-$clusterOverrides =
loadClusterList(getRealmSpecificFilename("$base/wmf-config/db.php"));
+$clusterOverrides = loadClusterList(getRealmSpecificFilename(
MEDIAWIKI_STAGING_DIR . '/wmf-config/db.php'));
$clusterAssignments = array();
-$all = MWWikiversions::readDbListFile( getRealmSpecificFilename(
"$base/all.dblist" ) );
+$all = MWWikiversions::readDbListFile( getRealmSpecificFilename(
MEDIAWIKI_DBLIST_DIR . "/all.dblist" ) );
listOut('all', $all, false);
-printf("%d wikis listed in " .
basename(getRealmSpecificFilename("$base/all.dblist")) . "...\n", count($all));
+printf("%d wikis listed in " .
basename(getRealmSpecificFilename(MEDIAWIKI_DBLIST_DIR . "/all.dblist")) .
"...\n", count($all));
-$special = MWWikiversions::readDbListFile( getRealmSpecificFilename(
"$base/special.dblist" ) );
+$special = MWWikiversions::readDbListFile( getRealmSpecificFilename(
MEDIAWIKI_DBLIST_DIR . "/special.dblist" ) );
listOut('special', $special, false);
printf("%d special wikis to be exempted from wikipedia group...\n",
count($special));
@@ -109,7 +109,7 @@
function listOut($group, $list, $print = true) {
global $base;
- $filename = getRealmSpecificFilename("$base/$group.dblist");
+ $filename = getRealmSpecificFilename(MEDIAWIKI_DBLIST_DIR .
"/$group.dblist");
if ( $print ) {
printf("Listing %d wikis in %s...\n", count($list), $filename);
}
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 133a8fd..9b09650 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -146,7 +146,7 @@
'commonsuploads', 'nonbetafeatures', 'group0',
'wikipedia',
'arbitraryaccess', 'nonglobal',
) as $tag ) {
- $dblist = MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../$tag.dblist" ) );
+ $dblist = MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . "/$tag.dblist" ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
}
@@ -515,9 +515,9 @@
// Config for sitematrix
$wgSiteMatrixFile = getRealmSpecificFilename( "$IP/../langlist" );
-$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../closed.dblist" ) );
-$wgSiteMatrixPrivateSites = MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../private.dblist" ) );
-$wgSiteMatrixFishbowlSites = MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../fishbowl.dblist" ) );
+$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . '/closed.dblist' ) );
+$wgSiteMatrixPrivateSites = MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . '/private.dblist' ) );
+$wgSiteMatrixFishbowlSites = MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . '/fishbowl.dblist' ) );
if ( $wmgUseCharInsert ) {
wfLoadExtension( 'CharInsert' );
@@ -1209,7 +1209,7 @@
$wgSiteMatrixPrivateSites,
$wgSiteMatrixFishbowlSites,
$wgSiteMatrixClosedSites,
- MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../nonglobal.dblist" ) )
+ MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . '/nonglobal.dblist' ) )
);
return false;
}
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 2951083..4bd44b7 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -71,13 +71,13 @@
$wgPropertySuggesterClassifyingPropertyIds = array( 7 );
} else {
$wgWBRepoSettings['clientDbList'] = array_diff(
- MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../wikidataclient.dblist" ) ),
+ MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . '/wikidataclient.dblist' ) ),
array( 'testwikidatawiki', 'testwiki', 'test2wiki' )
);
// Exclude closed wikis
$wgWBRepoSettings['clientDbList'] = array_diff(
$wgWBRepoSettings['clientDbList'],
- MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../closed.dblist" ) )
+ MWWikiversions::readDbListFile(
getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . '/closed.dblist' ) )
);
}
diff --git a/wmf-config/wgConf.php b/wmf-config/wgConf.php
index b356e7b..0340957 100644
--- a/wmf-config/wgConf.php
+++ b/wmf-config/wgConf.php
@@ -22,7 +22,7 @@
$wgConf->localVHosts = require( getRealmSpecificFilename(
"$wmfConfigDir/wgConfVHosts.php" ) );
-$wgConf->wikis = MWWikiversions::readDbListFile( getRealmSpecificFilename(
"$IP/../all.dblist" ) );
+$wgConf->wikis = MWWikiversions::readDbListFile( getRealmSpecificFilename(
MEDIAWIKI_DBLIST_DIR . '/all.dblist' ) );
$wgConf->fullLoadCallback = 'wmfLoadInitialiseSettings';
--
To view, visit https://gerrit.wikimedia.org/r/244740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib908b844d31d16f843364615644de41b81ea3d33
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
