| Index: branches/wmf-deployment/maintenance/commandLine.inc |
| — | — | @@ -116,14 +116,15 @@ |
| 117 | 117 | $wgUseNormalUser = false; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | | -if ( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { |
| | 120 | +// Fixme: replace this hack with general farm-friendly code |
| | 121 | +if ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) { |
| 121 | 122 | $wgWikiFarm = true; |
| 122 | 123 | $cluster = 'pmtpa'; |
| 123 | 124 | require_once( "$IP/includes/AutoLoader.php" ); |
| 124 | 125 | require_once( "$IP/includes/SiteConfiguration.php" ); |
| 125 | 126 | |
| 126 | 127 | # Get $wgConf |
| 127 | | - require( "$IP/wgConf.php" ); |
| | 128 | + require( "$IP/wmf-config/wgConf.php" ); |
| 128 | 129 | |
| 129 | 130 | if ( empty( $wgNoDBParam ) ) { |
| 130 | 131 | # Check if we were passed a db name |
| — | — | @@ -170,7 +171,7 @@ |
| 171 | 172 | |
| 172 | 173 | #require_once( $IP.'/includes/ProfilerStub.php' ); |
| 173 | 174 | require( $IP.'/includes/Defines.php' ); |
| 174 | | - require( $IP.'/CommonSettings.php' ); |
| | 175 | + require( $IP.'/wmf-config/CommonSettings.php' ); |
| 175 | 176 | if ( !$wgUseNormalUser ) { |
| 176 | 177 | require( $IP.'/AdminSettings.php' ); |
| 177 | 178 | } |