| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -646,6 +646,19 @@ |
| 647 | 647 | $wgLocalDatabases = array(); |
| 648 | 648 | |
| 649 | 649 | /** |
| | 650 | + * For multi-wiki clusters with multiple master servers; if an alternate |
| | 651 | + * is listed for the requested database, a connection to it will be opened |
| | 652 | + * instead of to the current wiki's regular master server when cross-wiki |
| | 653 | + * data operations are done from here. |
| | 654 | + * |
| | 655 | + * Requires that the other server be accessible by network, with the same |
| | 656 | + * username/password as the primary. |
| | 657 | + * |
| | 658 | + * eg $wgAlternateMaster['enwiki'] = 'ariel'; |
| | 659 | + */ |
| | 660 | +$wgAlternateMaster = array(); |
| | 661 | + |
| | 662 | +/** |
| 650 | 663 | * Object cache settings |
| 651 | 664 | * See Defines.php for types |
| 652 | 665 | */ |
| Index: trunk/extensions/Makesysop/SpecialMakesysop.php |
| — | — | @@ -32,18 +32,6 @@ |
| 33 | 33 | |
| 34 | 34 | $wgAvailableRights[] = 'makesysop'; |
| 35 | 35 | |
| 36 | | -/** |
| 37 | | - * Quick hack for clusters with multiple master servers; if an alternate |
| 38 | | - * is listed for the requested database, a connection to it will be opened |
| 39 | | - * instead of to the current wiki's regular master server. |
| 40 | | - * |
| 41 | | - * Requires that the other server be accessible by network, with the same |
| 42 | | - * username/password as the primary. |
| 43 | | - * |
| 44 | | - * eg $wgAlternateMaster['enwiki'] = 'ariel'; |
| 45 | | - */ |
| 46 | | -$wgAlternateMaster = array(); |
| 47 | | - |
| 48 | 36 | # Register special page |
| 49 | 37 | if ( !function_exists( 'extAddSpecialPage' ) ) { |
| 50 | 38 | require( dirname(__FILE__) . '/../ExtensionFunctions.php' ); |