tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-25 18:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix port for internal db

Browse Source 
Fix db factory to use that port

refs #4941
This commit is contained in:
Marius Hein 2013-10-22 13:49:04 +02:00
parent 6017432750
commit 9ebd2c0478
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/resources.ini.in Normal file → Executable file
View File

@ -17,6 +17,7 @@
type = db type = db
db = @internal_db_type@ db = @internal_db_type@
host = @internal_db_host@ host = @internal_db_host@
port = @internal_db_port@
password = @internal_db_pass@ password = @internal_db_pass@
username = @internal_db_user@ username = @internal_db_user@
dbname = @internal_db_name@ dbname = @internal_db_name@
@ -25,7 +26,7 @@ dbname = @internal_db_name@
type = db type = db
db = @ido_db_type@ db = @ido_db_type@
host = @ido_host@ host = @ido_host@
port = @ido_port@
password = @ido_user@ password = @ido_user@
username = @ido_user@ username = @ido_user@
port = @ido_port@
dbname = @ido_database@ dbname = @ido_database@

2
library/Icinga/Application/DbAdapterFactory.php
View File

@ -219,8 +219,10 @@ class DbAdapterFactory implements ConfigAwareFactory
); );
switch ($config->db) { switch ($config->db) {
case 'mysql': case 'mysql':
$options['port'] = $config->get('port', 3306);
return self::callFactory('Pdo_Mysql', $options); return self::callFactory('Pdo_Mysql', $options);
case 'pgsql': case 'pgsql':
$options['port'] = $config->get('port', 5432);
return self::callFactory('Pdo_Pgsql', $options); return self::callFactory('Pdo_Pgsql', $options);
default: default:
if (!$config->db) { if (!$config->db) {