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

Merge pull request #3261 from Icinga/bugfix/icingacli-no-setup-module-2705 

Make icingacli working without the setup module
This commit is contained in:
lippserd 2018-01-17 11:58:50 +01:00 committed by GitHub
parent ddfafb27f6 8cbd506459
commit c18038f166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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'))) {
$this->requiresSetup = true;
$this->moduleManager->loadModule('setup');
if ($this->moduleManager->hasInstalled('setup')) {
$this->moduleManager->loadModule('setup');
}
} elseif ($this->setupTokenExists()) {
// Load setup module but do not require setup
$this->moduleManager->loadModule('setup');
if ($this->moduleManager->hasInstalled('setup')) {
$this->moduleManager->loadModule('setup');
}
}
return $this;
}