X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=9531644e2642ccceeef5c89396874db25033d902;hb=9ef2ebad9d7ed1361a84f13ba0c9b9f5e440ff13;hp=70bc30c9f6db057bf7e8302cc77a623edfe683a4;hpb=2dbed8d5cd1bae41f18d9c3cb0e5e34864aa924d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/install.php b/maintenance/install.php
index 70bc30c9f6..9531644e26 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -20,45 +20,88 @@
  * @see wfWaitForSlaves()
  */
 
+if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) {
+	echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" .
+	"Check if you have a newer php executable with a different name, such as php5.\n";
+	die( 1 );
+}
+
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
+define( 'MEDIAWIKI_INSTALL', true );
 
 require_once( dirname( dirname( __FILE__ ) )."/maintenance/Maintenance.php" );
 
 class CommandLineInstaller extends Maintenance {
-	public function __construct() {
+	function __construct() {
 		parent::__construct();
+		global $IP;
 
 		$this->addArg( 'name', 'The name of the wiki', true);
 
-		$this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', false);
-		$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( 'dbpassfile', 'An alternative way to provide dbpass option, as the contents of this file', false, true );
+		$this->addOption( 'confpath', "Path to write LocalSettings.php to, default $IP", 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 ); */
+		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
 	}
 
-	public function execute() {
+	function execute() {
+		global $IP, $wgTitle;
+		$siteName = isset( $this->mArgs[0] ) ? $this->mArgs[0] : "Don't care"; // Will not be set if used with --env-checks
 		$adminName = isset( $this->mArgs[1] ) ? $this->mArgs[1] : null;
+		$wgTitle = Title::newFromText( 'Installer script' );
+
+		$dbpassfile = $this->getOption( 'dbpassfile', false );
+		if ( $dbpassfile !== false ) {
+			wfSuppressWarnings();
+			$dbpass = file_get_contents( $dbpassfile );
+			wfRestoreWarnings();
+			if ( $dbpass === false ) {
+				$this->error( "Couldn't open $dbpassfile", true );
+			}
+			$this->mOptions['dbpass'] = trim( $dbpass, "\r\n" );
+		}
 
 		$installer =
-			new CliInstaller( $this->mArgs[0], $adminName, $this->mOptions );
+			new CliInstaller( $siteName, $adminName, $this->mOptions );
+
+		$status = $installer->doEnvironmentChecks();
+		if( $status->isGood() ) {
+			$installer->showMessage( 'config-env-good' );
+		} else {
+			$installer->showStatusMessage( $status );
+			return;
+		}
+		if( !$this->hasOption( 'env-checks' ) ) {
+			$installer->execute();
+			$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
+		}
+	}
 
-		$installer->execute();
+	function validateParamsAndArgs() {
+		if ( !$this->hasOption( 'env-checks' ) ) {
+			parent::validateParamsAndArgs();
+		}
 	}
 }
 
 $maintClass = "CommandLineInstaller";
 
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );