From 1b68ff674c6c51091cf1d25ef71d84c40a00b2c4 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Tue, 17 Jan 2006 09:01:26 +0000 Subject: [PATCH] --conf option for specifying a different LocalSettings.php. This allows multiple wikis to run off a single script directory, without the benefit of wikimedia-only magic. --- maintenance/commandLine.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index 1fecc0a4da..c213a2edd8 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -23,6 +23,7 @@ define('MEDIAWIKI',true); if ( !isset( $optionsWithArgs ) ) { $optionsWithArgs = array(); } +$optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php $self = array_shift( $argv ); $self = __FILE__; @@ -141,7 +142,11 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) { } } else { $wgWikiFarm = false; - $settingsFile = $IP.'/LocalSettings.php'; + if ( isset( $options['conf'] ) ) { + $settingsFile = $options['conf']; + } else { + $settingsFile = "$IP/LocalSettings.php"; + } if ( ! is_readable( $settingsFile ) ) { print "A copy of your installation's LocalSettings.php\n" . -- 2.20.1