tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add todo to the MonitoringWizard related to the livestatus backend type

Browse Source 
The requirement should be added to the OR-set that has currently both
ido requirement sets so that livestatus may the only choice again.

refs #8254
This commit is contained in:
Johannes Meyer 2015-03-10 11:00:51 +01:00
parent 59f43a0f5e
commit f4446cbade
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/monitoring/library/Monitoring/MonitoringWizard.php
View File

@ -138,6 +138,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
{ {
$set = new RequirementSet(); $set = new RequirementSet();
// TODO(8254): Add this to the $backendSet
$set->add(new PhpModuleRequirement(array( $set->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'Sockets', 'condition' => 'Sockets',
@ -148,7 +149,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
) )
))); )));
$idoSet = new RequirementSet(false, RequirementSet::MODE_OR); $backendSet = new RequirementSet(false, RequirementSet::MODE_OR);
$mysqlSet = new RequirementSet(true); $mysqlSet = new RequirementSet(true);
$mysqlSet->add(new PhpModuleRequirement(array( $mysqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
@ -168,7 +169,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
'The Zend database adapter for MySQL is required to access a MySQL database.' 'The Zend database adapter for MySQL is required to access a MySQL database.'
) )
))); )));
$idoSet->merge($mysqlSet); $backendSet->merge($mysqlSet);
$pgsqlSet = new RequirementSet(true); $pgsqlSet = new RequirementSet(true);
$pgsqlSet->add(new PhpModuleRequirement(array( $pgsqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
@ -188,8 +189,8 @@ class MonitoringWizard extends Wizard implements SetupWizard
'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.' 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
) )
))); )));
$idoSet->merge($pgsqlSet); $backendSet->merge($pgsqlSet);
$set->merge($idoSet); $set->merge($backendSet);
return $set; return $set;
} }