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

Do not create directories which are created automatically if necessary

Browse Source 
refs #8219
This commit is contained in:
Johannes Meyer 2015-01-30 15:43:39 +01:00
parent 9426a5bd23
commit 6416fc421c
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,14 +4,12 @@
namespace Icinga\Module\Monitoring;
use Icinga\Application\Icinga;
use Icinga\Web\Form;
use Icinga\Web\Wizard;
use Icinga\Web\Request;
use Icinga\Module\Setup\Setup;
use Icinga\Module\Setup\SetupWizard;
use Icinga\Module\Setup\Requirements;
use Icinga\Module\Setup\Utils\MakeDirStep;
use Icinga\Module\Setup\Forms\SummaryPage;
use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
@ -108,8 +106,6 @@ class MonitoringWizard extends Wizard implements SetupWizard
$pageData = $this->getPageData();
$setup = new Setup();
$setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
$setup->addStep(
new BackendStep(array(
'backendConfig' => $pageData['setup_monitoring_backend'],

12
modules/setup/library/Setup/WebWizard.php
View File

@ -334,17 +334,7 @@ class WebWizard extends Wizard implements SetupWizard
);
}
$configDir = Icinga::app()->getConfigDir();
$setup->addStep(
new MakeDirStep(
array(
$configDir . DIRECTORY_SEPARATOR . 'modules',
$configDir . DIRECTORY_SEPARATOR . 'preferences',
$configDir . DIRECTORY_SEPARATOR . 'enabledModules'
),
2770
)
);
$setup->addStep(new MakeDirStep(array(Config::resolvePath('enabledModules')), 2770));
foreach ($this->getWizards() as $wizard) {
if ($wizard->isComplete()) {