tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make icingacli working without the setup module 

This enables users to install only the icingacli package

refs #2705
This commit is contained in:
Alexander A. Klimov 2018-01-16 12:21:42 +01:00
parent 5cb7deda20
commit 8cbd506459
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -460,10 +460,14 @@ abstract class ApplicationBootstrap
{ {
if (! @file_exists($this->config->resolvePath('authentication.ini'))) { if (! @file_exists($this->config->resolvePath('authentication.ini'))) {
$this->requiresSetup = true; $this->requiresSetup = true;
$this->moduleManager->loadModule('setup'); if ($this->moduleManager->hasInstalled('setup')) {
$this->moduleManager->loadModule('setup');
}
} elseif ($this->setupTokenExists()) { } elseif ($this->setupTokenExists()) {
// Load setup module but do not require setup // Load setup module but do not require setup
$this->moduleManager->loadModule('setup'); if ($this->moduleManager->hasInstalled('setup')) {
$this->moduleManager->loadModule('setup');
}
} }
return $this; return $this;
} }