http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74130
Revision: 74130
Author: ialex
Date: 2010-10-02 07:39:17 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
Uncommented some used options; added the possibility to define $wgScriptPath
Modified Paths:
--------------
trunk/phase3/includes/installer/CliInstaller.php
trunk/phase3/maintenance/install.php
Modified: trunk/phase3/includes/installer/CliInstaller.php
===================================================================
--- trunk/phase3/includes/installer/CliInstaller.php 2010-10-02 06:49:52 UTC
(rev 74129)
+++ trunk/phase3/includes/installer/CliInstaller.php 2010-10-02 07:39:17 UTC
(rev 74130)
@@ -31,6 +31,7 @@
'dbschema' => 'wgDBmwschema',
'dbts2schema' => 'wgDBts2schema',
'dbpath' => 'wgSQLiteDataDir',
+ 'scriptpath' => 'wgScriptPath',
);
/**
Modified: trunk/phase3/maintenance/install.php
===================================================================
--- trunk/phase3/maintenance/install.php 2010-10-02 06:49:52 UTC (rev
74129)
+++ trunk/phase3/maintenance/install.php 2010-10-02 07:39:17 UTC (rev
74130)
@@ -30,20 +30,23 @@
$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 ); */
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
