r34694 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r34693‎ | r34694 | r34695 >
Date:22:01, 12 May 2008
Author:brion
Status:old
Tags:
Comment:
apply live hacks from wikimedia site:
* fix $wgDBadminuser/pass usage with new load balancer
* some test.wikipedia check... yay hardcoded crap :D
* hardcoded wikimedia PMTPA check, yay
Modified paths:
  • /trunk/phase3/maintenance/commandLine.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/commandLine.inc
@@ -111,7 +111,8 @@
112112
113113 if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
114114 $wgWikiFarm = true;
115 - $cluster = trim( file_get_contents( '/etc/cluster' ) );
 115+ #$cluster = trim( file_get_contents( '/etc/cluster' ) );
 116+ $cluster = 'pmtpa';
116117 require_once( "$IP/includes/SiteConfiguration.php" );
117118
118119 # Get $wgConf
@@ -152,6 +153,10 @@
153154 $DP = $IP;
154155 ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
155156
 157+ if ( $lang == 'test' && $site == 'wikipedia' ) {
 158+ define( 'TESTWIKI', 1 );
 159+ }
 160+
156161 #require_once( $IP.'/includes/ProfilerStub.php' );
157162 require_once( $IP.'/includes/Defines.php' );
158163 require_once( $IP.'/CommonSettings.php' );
@@ -209,6 +214,10 @@
210215 $wgDBservers[$i]['password'] = $wgDBpassword;
211216 }
212217 }
 218+ if( isset( $wgLBFactoryConf['serverTemplate'] ) ) {
 219+ $wgLBFactoryConf['serverTemplate']['user'] = $wgDBuser;
 220+ $wgLBFactoryConf['serverTemplate']['password'] = $wgDBpassword;
 221+ }
213222 }
214223
215224 if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {

Status & tagging log