tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

setup: Require to set a path to the schema files

Browse Source 
refs #8232
This commit is contained in:
Eric Lippmann 2015-01-16 18:10:19 +01:00
parent 556610adc1
commit ef412688e9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/setup/library/Setup/Steps/DatabaseStep.php
View File

@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
use Exception; use Exception;
use PDOException; use PDOException;
use Icinga\Application\Icinga;
use Icinga\Module\Setup\Step; use Icinga\Module\Setup\Step;
use Icinga\Module\Setup\Utils\DbTool; use Icinga\Module\Setup\Utils\DbTool;
use Icinga\Module\Setup\Exception\SetupException; use Icinga\Module\Setup\Exception\SetupException;
@ -71,7 +70,7 @@ class DatabaseStep extends Step
$this->log(mt('setup', 'Database schema already exists...')); $this->log(mt('setup', 'Database schema already exists...'));
} else { } else {
$this->log(mt('setup', 'Creating database schema...')); $this->log(mt('setup', 'Creating database schema...'));
$db->import(Icinga::app()->getApplicationDir() . '/../etc/schema/mysql.schema.sql'); $db->import($this->data['schemaPath'] . '/mysql.schema.sql');
} }
if ($db->hasLogin($this->data['resourceConfig']['username'])) { if ($db->hasLogin($this->data['resourceConfig']['username'])) {
@ -122,7 +121,7 @@ class DatabaseStep extends Step
$this->log(mt('setup', 'Database schema already exists...')); $this->log(mt('setup', 'Database schema already exists...'));
} else { } else {
$this->log(mt('setup', 'Creating database schema...')); $this->log(mt('setup', 'Creating database schema...'));
$db->import(Icinga::app()->getApplicationDir() . '/../etc/schema/pgsql.schema.sql'); $db->import($this->data['schemaPath'] . '/pgsql.schema.sql');
} }
if ($db->hasLogin($this->data['resourceConfig']['username'])) { if ($db->hasLogin($this->data['resourceConfig']['username'])) {