http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56213
Revision: 56213
Author: brion
Date: 2009-09-11 23:18:28 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Forward-port r53264 from wmf-deployment branch: "Adjust paths in the
Wikimedia-specific command-line config hacks. Separating out most of the custom
config files..."
Modified Paths:
--------------
trunk/phase3/maintenance/doMaintenance.php
Modified: trunk/phase3/maintenance/doMaintenance.php
===================================================================
--- trunk/phase3/maintenance/doMaintenance.php 2009-09-11 22:52:22 UTC (rev
56212)
+++ trunk/phase3/maintenance/doMaintenance.php 2009-09-11 23:18:28 UTC (rev
56213)
@@ -58,7 +58,8 @@
}
// Load settings, using wikimedia-mode if needed
-if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) {
+// Fixme: replace this hack with general farm-friendly code
+if( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
# TODO FIXME! Wikimedia-specific stuff needs to go away to an ext
# Maybe a hook?
global $cluster;
@@ -66,10 +67,10 @@
$cluster = 'pmtpa';
require_once( "$IP/includes/AutoLoader.php" );
require_once( "$IP/includes/SiteConfiguration.php" );
- require( "$IP/wgConf.php" );
+ require( "$IP/wmf-config/wgConf.php" );
$maintenance->loadWikimediaSettings();
require( $IP.'/includes/Defines.php' );
- require( $IP.'/CommonSettings.php' );
+ require( $IP.'/wmf-config/CommonSettings.php' );
} else {
require_once( "$IP/includes/AutoLoader.php" );
require_once( "$IP/includes/Defines.php" );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
