| Index: trunk/phase3/maintenance/install.php |
| — | — | @@ -30,20 +30,23 @@ |
| 31 | 31 | |
| 32 | 32 | $this->addArg( 'name', 'The name of the wiki', true); |
| 33 | 33 | |
| 34 | | - $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true); |
| 35 | | - $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true); |
| 36 | | - $this->addOption( 'email', 'The email for the wiki administrator', false, true); |
| | 34 | + $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true ); |
| | 35 | + $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true ); |
| | 36 | + $this->addOption( 'email', 'The email for the wiki administrator', false, true ); |
| | 37 | + $this->addOption( 'scriptpath', 'The relative path of the wiki in the web server (/wiki)', false, true ); |
| 37 | 38 | |
| 38 | 39 | $this->addOption( 'lang', 'The language to use (en)', false, true ); |
| 39 | 40 | /* $this->addOption( 'cont-lang', 'The content language (en)', false, true ); */ |
| 40 | 41 | |
| 41 | 42 | $this->addOption( 'dbtype', 'The type of database (mysql)', false, true ); |
| 42 | | - /* $this->addOption( 'dbhost', 'The database host (localhost)', false, true ); */ |
| 43 | | - /* $this->addOption( 'dbport', 'The database port (3306 for mysql, 5432 for pg)', false, true ); */ |
| | 43 | + $this->addOption( 'dbserver', 'The database host (localhost)', false, true ); |
| | 44 | + $this->addOption( 'dbport', 'The database port; only for PostgreSQL (5432)', false, true ); |
| 44 | 45 | $this->addOption( 'dbname', 'The database name (my_wiki)', false, true ); |
| 45 | 46 | $this->addOption( 'dbpath', 'The path for the SQLite DB (/var/data)', false, true ); |
| 46 | 47 | $this->addOption( 'installdbuser', 'The user to use for installing (root)', false, true ); |
| 47 | 48 | $this->addOption( 'installdbpass', 'The pasword for the DB user to install as.', false, true ); |
| | 49 | + $this->addOption( 'dbuser', 'The user to use for normal operations (wikiuser)', false, true ); |
| | 50 | + $this->addOption( 'dbpass', 'The pasword for the DB user for normal operations', false, true ); |
| 48 | 51 | /* $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */ |
| 49 | 52 | /* $this->addOption( 'dbtsearch2schema', 'The schema for the tsearch2 DB in pg (public)', false, true ); */ |
| 50 | 53 | /* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */ |
| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -31,6 +31,7 @@ |
| 32 | 32 | 'dbschema' => 'wgDBmwschema', |
| 33 | 33 | 'dbts2schema' => 'wgDBts2schema', |
| 34 | 34 | 'dbpath' => 'wgSQLiteDataDir', |
| | 35 | + 'scriptpath' => 'wgScriptPath', |
| 35 | 36 | ); |
| 36 | 37 | |
| 37 | 38 | /** |