jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Fix various path inflexibilities and inconsistencies"
......................................................................
Revert "Fix various path inflexibilities and inconsistencies"
This reverts commit aba9e725d5bd4b4041e2c743d61303e914abb00e.
Change-Id: Iff3e98fcdad02a206fa2cd585db60df6e5417154
---
M multiversion/MWVersion.php
M multiversion/defines.php
M multiversion/populateWikiversions
M wmf-config/CommonSettings.php
M wmf-config/wgConf.php
5 files changed, 13 insertions(+), 17 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWVersion.php b/multiversion/MWVersion.php
index 943c2ad..7236791 100644
--- a/multiversion/MWVersion.php
+++ b/multiversion/MWVersion.php
@@ -43,7 +43,7 @@
# MW_SECURE_HOST set from secure gateway?
$secure = getenv( 'MW_SECURE_HOST' );
- $host = $secure ? $secure : @$_SERVER['HTTP_HOST'];
+ $host = $secure ? $secure : $_SERVER['HTTP_HOST'];
# Get the correct MediaWiki path based on this version...
$IP = MULTIVER_COMMON_APACHE . "/$version";
diff --git a/multiversion/defines.php b/multiversion/defines.php
index 905a14e..2372eec 100644
--- a/multiversion/defines.php
+++ b/multiversion/defines.php
@@ -5,8 +5,8 @@
define( 'MULTIVER_COMMON_HOME', '/a/common' );
define( 'MULTIVER_COMMON_APACHE', '/usr/local/apache/common-local' );
-define( 'MULTIVER_CDB_DIR_HOME', MULTIVER_COMMON_HOME );
-define( 'MULTIVER_CDB_DIR_APACHE', MULTIVER_COMMON_APACHE );
+define( 'MULTIVER_CDB_DIR_HOME', '/a/common' );
+define( 'MULTIVER_CDB_DIR_APACHE', '/usr/local/apache/common-local' );
-define( 'MULTIVER_404SCRIPT_PATH_HOME', MULTIVER_COMMON_HOME .
'/wmf-config/missing.php' );
-define( 'MULTIVER_404SCRIPT_PATH_APACHE', MULTIVER_COMMON_APACHE .
'/wmf-config/missing.php' );
+define( 'MULTIVER_404SCRIPT_PATH_HOME', '/a/common/wmf-config/missing.php' );
+define( 'MULTIVER_404SCRIPT_PATH_APACHE',
'/usr/local/apache/common-local/wmf-config/missing.php' );
diff --git a/multiversion/populateWikiversions
b/multiversion/populateWikiversions
index 323e5a9..b2536a4 100755
--- a/multiversion/populateWikiversions
+++ b/multiversion/populateWikiversions
@@ -2,8 +2,6 @@
<?php
error_reporting( E_ALL );
-
-require_once( __DIR__ . '/defines.php' );
require_once( __DIR__ . '/MWRealm.php' );
/*
* Populate wikiversions.cdb file using all the items in all.dblist
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e2128e1..97ecb5d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -39,8 +39,7 @@
# Protection for unusual entry points
if ( !function_exists( 'wfProfileIn' ) ) {
- require_once( './includes/profiler/Profiler.php' );
- require_once( './includes/profiler/ProfilerStub.php' );
+ require( './includes/ProfilerStub.php' );
}
$fname = 'CommonSettings.php';
@@ -134,8 +133,7 @@
$wgDBuser = 'wikiuser';
# wmf-config directory (in common/)
-$wmfCommonDir = dirname( __DIR__ );
-$wmfConfigDir = __DIR__;
+$wmfConfigDir = "$IP/../wmf-config";
wfProfileOut( "$fname-host" );
@@ -200,7 +198,7 @@
$wikiTags = array();
foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium', 'large', 'wikimania', 'wikidata',
'wikidataclient', 'visualeditor' ) as $tag ) {
- $dblist = array_map( 'trim', file( getRealmSpecificFilename(
"$wmfCommonDir/$tag.dblist" ) ) );
+ $dblist = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../$tag.dblist" ) ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
}
@@ -560,9 +558,9 @@
// Config for sitematrix
$wgSiteMatrixFile = '/apache/common/langlist';
-$wgSiteMatrixClosedSites = array_map( 'trim', file( getRealmSpecificFilename(
"$wmfCommonDir/closed.dblist" ) ) );
-$wgSiteMatrixPrivateSites = array_map( 'trim', file( getRealmSpecificFilename(
"$wmfCommonDir/private.dblist" ) ) );
-$wgSiteMatrixFishbowlSites = array_map( 'trim', file(
getRealmSpecificFilename( "$wmfCommonDir/fishbowl.dblist" ) ) );
+$wgSiteMatrixClosedSites = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../closed.dblist" ) ) );
+$wgSiteMatrixPrivateSites = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../private.dblist" ) ) );
+$wgSiteMatrixFishbowlSites = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../fishbowl.dblist" ) ) );
include( $IP . '/extensions/CharInsert/CharInsert.php' );
@@ -2492,7 +2490,7 @@
$wgWBRepoSettings['clientDbList'] = array_merge(
array( 'test2wiki' => 'test2wiki' ),
- array_map( 'trim', file( getRealmSpecificFilename(
"$wmfCommonDir/wikipedia.dblist" ) ) )
+ array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../wikipedia.dblist" ) ) )
);
$wgWBRepoSettings['localClientDatabases'] = array_combine(
diff --git a/wmf-config/wgConf.php b/wmf-config/wgConf.php
index 0f6ed30..dd2e29a 100644
--- a/wmf-config/wgConf.php
+++ b/wmf-config/wgConf.php
@@ -22,7 +22,7 @@
$wgConf->localVHosts = require( getRealmSpecificFilename(
"$wmfConfigDir/wgConfVHosts.php" ) );
-$wgConf->wikis = array_map( 'trim', file( getRealmSpecificFilename(
"$wmfCommonDir/all.dblist" ) ) );
+$wgConf->wikis = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../all.dblist" ) ) );
$wgConf->fullLoadCallback = 'wmfLoadInitialiseSettings';
--
To view, visit https://gerrit.wikimedia.org/r/72561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff3e98fcdad02a206fa2cd585db60df6e5417154
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
