diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-07 11:20:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 11:20:08 +0300 |
| commit | ed28885d73181e61c06802639910014e8a265e42 (patch) | |
| tree | afd1c9c5c47a99d6bc8febf0bfaa3d3723e73728 /core | |
| parent | f78f44d1e93411cd64653a8705f8fde450b441ae (diff) | |
| parent | 0638937ada237f6bd05620dfb16cfa17c6b971b7 (diff) | |
Merge pull request #323 from Faldon/database_port
Added occ install option for database-port
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Maintenance/Install.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index 12a61d6341a..cee0c60b488 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -50,6 +50,7 @@ class Install extends Command { ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite') ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database') ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost') + ->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on') ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database') ->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null) ->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null) @@ -106,6 +107,7 @@ class Install extends Command { $dbUser = $input->getOption('database-user'); $dbPass = $input->getOption('database-pass'); $dbName = $input->getOption('database-name'); + $dbPort = $input->getOption('database-port'); if ($db === 'oci') { // an empty hostname needs to be read from the raw parameters $dbHost = $input->getParameterOption('--database-host', ''); @@ -158,6 +160,7 @@ class Install extends Command { 'dbpass' => $dbPass, 'dbname' => $dbName, 'dbhost' => $dbHost, + 'dbport' => $dbPort, 'dbtableprefix' => $dbTablePrefix, 'adminlogin' => $adminLogin, 'adminpass' => $adminPassword, |