jenkins-bot has submitted this change and it was merged.
Change subject: Replace remaining references to /u/l/a/common
......................................................................
Replace remaining references to /u/l/a/common
Change-Id: I0bda3deabf9659485a7a21bb873110331a4a901f
---
M extract2.php
M mobilelanding.php
M multiversion/checkoutMediaWiki.php
M tests/multiversion/MWMultiVersionTest.php
M w/favicon.php
M w/robots.php
M w/touch.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
9 files changed, 27 insertions(+), 27 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Reedy: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/extract2.php b/extract2.php
index f3ff291..903bd5e 100644
--- a/extract2.php
+++ b/extract2.php
@@ -2,7 +2,7 @@
$lang = 'meta';
putenv( "MW_LANG={$lang}" ); // notify MWMultiVersion
-include '/usr/local/apache/common/w/MWVersion.php';
+include '/srv/mediawiki/w/MWVersion.php';
include getMediaWiki( 'includes/WebStart.php' );
$allowed_templates = array(
diff --git a/mobilelanding.php b/mobilelanding.php
index a5f9a1c..0dd215a 100644
--- a/mobilelanding.php
+++ b/mobilelanding.php
@@ -1,7 +1,7 @@
<?php
putenv( "MW_LANG=en" ); // notify MWMultiVersion
-include '/usr/local/apache/common/w/MWVersion.php';
+include '/srv/mediawiki/w/MWVersion.php';
include getMediaWiki( 'includes/WebStart.php' );
$code = '302';
diff --git a/multiversion/checkoutMediaWiki.php
b/multiversion/checkoutMediaWiki.php
index 0d64b7b..6dd5f38 100644
--- a/multiversion/checkoutMediaWiki.php
+++ b/multiversion/checkoutMediaWiki.php
@@ -95,7 +95,7 @@
$localSettingsCode = <<<PHP
<?php
# WARNING: This file is publically viewable on the web. Do not put private
data here.
-include_once( "/usr/local/apache/common/wmf-config/CommonSettings.php" );
+include_once( "/srv/mediawiki/wmf-config/CommonSettings.php" );
PHP;
# Create LocalSettings.php stub...
diff --git a/tests/multiversion/MWMultiVersionTest.php
b/tests/multiversion/MWMultiVersionTest.php
index 93e1b76..f1fa751 100644
--- a/tests/multiversion/MWMultiVersionTest.php
+++ b/tests/multiversion/MWMultiVersionTest.php
@@ -19,7 +19,7 @@
}
function provideServerNameAndDocRoot() {
- $root = '/usr/local/apache/common/docroot';
+ $root = '/srv/mediawiki/docroot';
return array(
// (expected DB, server name [, message]]
diff --git a/w/favicon.php b/w/favicon.php
index 51641f5..2d09814 100644
--- a/w/favicon.php
+++ b/w/favicon.php
@@ -1,5 +1,5 @@
<?php
-require( "/usr/local/apache/common/w/MWVersion.php" );
+require( "/srv/mediawiki/w/MWVersion.php" );
require( getMediaWiki( "includes/WebStart.php" ) );
function faviconShowError( $html ) {
diff --git a/w/robots.php b/w/robots.php
index 60ac511..18fd51d 100644
--- a/w/robots.php
+++ b/w/robots.php
@@ -11,7 +11,7 @@
header( 'X-Site: ' . $site );
header( 'Vary: X-Subdomain' );
-$robotsfile = '/usr/local/apache/common/robots.txt';
+$robotsfile = '/srv/mediawiki/robots.txt';
$robots = fopen( $robotsfile, 'rb' );
$text = '';
diff --git a/w/touch.php b/w/touch.php
index e512fae..dab3caf 100644
--- a/w/touch.php
+++ b/w/touch.php
@@ -1,5 +1,5 @@
<?php
-require( "/usr/local/apache/common/w/MWVersion.php" );
+require( "/srv/mediawiki/w/MWVersion.php" );
require( getMediaWiki( "includes/WebStart.php" ) );
function faviconShowError( $html ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4804403..89dcf5f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -555,7 +555,7 @@
$wgTimelineSettings->epochTimestamp = '20130101000000';
}
-putenv( "GDFONTPATH=/usr/local/apache/common/fonts" );
+putenv( "GDFONTPATH=/srv/mediawiki/fonts" );
if ( $wmgUseWikiHiero ) {
include( $IP . '/extensions/wikihiero/wikihiero.php' );
@@ -564,7 +564,7 @@
include( $IP . '/extensions/SiteMatrix/SiteMatrix.php' );
// Config for sitematrix
-$wgSiteMatrixFile = '/usr/local/apache/common/langlist';
+$wgSiteMatrixFile = '/srv/mediawiki/langlist';
$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" ) ) );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index b11a9a1..ee38d98 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10094,25 +10094,25 @@
'wmgCentralAuthLoginIcon' => array(
'default' => false,
- 'wiki' => '/usr/local/apache/common/images/sul/wikipedia.png',
- 'wikibooks' => '/usr/local/apache/common/images/sul/wikibooks.png',
- 'wikinews' => '/usr/local/apache/common/images/sul/wikinews.png',
- 'wikiquote' => '/usr/local/apache/common/images/sul/wikiquote.png',
- 'wikisource' => '/usr/local/apache/common/images/sul/wikisource.png',
- 'sourceswiki' => '/usr/local/apache/common/images/sul/wikisource.png',
- 'wikiversity' => '/usr/local/apache/common/images/sul/wikiversity.png',
- 'wiktionary' => '/usr/local/apache/common/images/sul/wiktionary.png',
- 'metawiki' => '/usr/local/apache/common/images/sul/meta.png',
- 'commonswiki' => '/usr/local/apache/common/images/sul/commons.png',
- 'mediawikiwiki' => '/usr/local/apache/common/images/sul/mediawiki.png',
- 'wikidatawiki' => '/usr/local/apache/common/images/sul/wikidata.png',
- 'specieswiki' => '/usr/local/apache/common/images/sul/wikispecies.png',
- 'incubatorwiki' =>
'/usr/local/apache/common/images/sul/incubatorwiki.png',
- 'wikivoyage' => '/usr/local/apache/common/images/sul/wikivoyage.png',
- 'wikimania2014wiki' =>
'/usr/local/apache/common/images/sul/wikimania.png',
- 'loginwiki' => '/usr/local/apache/common/images/sul/foundation.png',
+ 'wiki' => '/srv/mediawiki/images/sul/wikipedia.png',
+ 'wikibooks' => '/srv/mediawiki/images/sul/wikibooks.png',
+ 'wikinews' => '/srv/mediawiki/images/sul/wikinews.png',
+ 'wikiquote' => '/srv/mediawiki/images/sul/wikiquote.png',
+ 'wikisource' => '/srv/mediawiki/images/sul/wikisource.png',
+ 'sourceswiki' => '/srv/mediawiki/images/sul/wikisource.png',
+ 'wikiversity' => '/srv/mediawiki/images/sul/wikiversity.png',
+ 'wiktionary' => '/srv/mediawiki/images/sul/wiktionary.png',
+ 'metawiki' => '/srv/mediawiki/images/sul/meta.png',
+ 'commonswiki' => '/srv/mediawiki/images/sul/commons.png',
+ 'mediawikiwiki' => '/srv/mediawiki/images/sul/mediawiki.png',
+ 'wikidatawiki' => '/srv/mediawiki/images/sul/wikidata.png',
+ 'specieswiki' => '/srv/mediawiki/images/sul/wikispecies.png',
+ 'incubatorwiki' => '/srv/mediawiki/images/sul/incubatorwiki.png',
+ 'wikivoyage' => '/srv/mediawiki/images/sul/wikivoyage.png',
+ 'wikimania2014wiki' => '/srv/mediawiki/images/sul/wikimania.png',
+ 'loginwiki' => '/srv/mediawiki/images/sul/foundation.png',
- 'brwikimedia' => '/usr/local/apache/common/images/sul/foundation.png',
+ 'brwikimedia' => '/srv/mediawiki/images/sul/foundation.png',
),
'wmgCentralAuthAutoLoginWikis' => array(
--
To view, visit https://gerrit.wikimedia.org/r/159650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bda3deabf9659485a7a21bb873110331a4a901f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[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
