From 4aa5c729e86aa3061d102cd239a9d577734e42d4 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 2 Oct 2010 07:39:17 +0000 Subject: [PATCH] Uncommented some used options; added the possibility to define $wgScriptPath --- includes/installer/CliInstaller.php | 1 + maintenance/install.php | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 69c9217ec1..0893ee1aa8 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -31,6 +31,7 @@ class CliInstaller extends CoreInstaller { 'dbschema' => 'wgDBmwschema', 'dbts2schema' => 'wgDBts2schema', 'dbpath' => 'wgSQLiteDataDir', + 'scriptpath' => 'wgScriptPath', ); /** diff --git a/maintenance/install.php b/maintenance/install.php index c30be05e12..a7b51794fd 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -30,20 +30,23 @@ class CommandLineInstaller extends Maintenance { $this->addArg( 'name', 'The name of the wiki', true); - $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true); - $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true); - $this->addOption( 'email', 'The email for the wiki administrator', false, true); + $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true ); + $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true ); + $this->addOption( 'email', 'The email for the wiki administrator', false, true ); + $this->addOption( 'scriptpath', 'The relative path of the wiki in the web server (/wiki)', false, true ); $this->addOption( 'lang', 'The language to use (en)', false, true ); /* $this->addOption( 'cont-lang', 'The content language (en)', false, true ); */ $this->addOption( 'dbtype', 'The type of database (mysql)', false, true ); - /* $this->addOption( 'dbhost', 'The database host (localhost)', false, true ); */ - /* $this->addOption( 'dbport', 'The database port (3306 for mysql, 5432 for pg)', false, true ); */ + $this->addOption( 'dbserver', 'The database host (localhost)', false, true ); + $this->addOption( 'dbport', 'The database port; only for PostgreSQL (5432)', false, true ); $this->addOption( 'dbname', 'The database name (my_wiki)', false, true ); $this->addOption( 'dbpath', 'The path for the SQLite DB (/var/data)', false, true ); $this->addOption( 'installdbuser', 'The user to use for installing (root)', false, true ); $this->addOption( 'installdbpass', 'The pasword for the DB user to install as.', false, true ); + $this->addOption( 'dbuser', 'The user to use for normal operations (wikiuser)', false, true ); + $this->addOption( 'dbpass', 'The pasword for the DB user for normal operations', false, true ); /* $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */ /* $this->addOption( 'dbtsearch2schema', 'The schema for the tsearch2 DB in pg (public)', false, true ); */ /* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */ -- 2.20.1