mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-28 16:24:04 +02:00
Do not create directories which are created automatically if necessary
refs #8219
This commit is contained in:
parent
9426a5bd23
commit
6416fc421c
@ -4,14 +4,12 @@
|
|||||||
|
|
||||||
namespace Icinga\Module\Monitoring;
|
namespace Icinga\Module\Monitoring;
|
||||||
|
|
||||||
use Icinga\Application\Icinga;
|
|
||||||
use Icinga\Web\Form;
|
use Icinga\Web\Form;
|
||||||
use Icinga\Web\Wizard;
|
use Icinga\Web\Wizard;
|
||||||
use Icinga\Web\Request;
|
use Icinga\Web\Request;
|
||||||
use Icinga\Module\Setup\Setup;
|
use Icinga\Module\Setup\Setup;
|
||||||
use Icinga\Module\Setup\SetupWizard;
|
use Icinga\Module\Setup\SetupWizard;
|
||||||
use Icinga\Module\Setup\Requirements;
|
use Icinga\Module\Setup\Requirements;
|
||||||
use Icinga\Module\Setup\Utils\MakeDirStep;
|
|
||||||
use Icinga\Module\Setup\Forms\SummaryPage;
|
use Icinga\Module\Setup\Forms\SummaryPage;
|
||||||
use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
|
use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
|
||||||
use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
|
use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
|
||||||
@ -108,8 +106,6 @@ class MonitoringWizard extends Wizard implements SetupWizard
|
|||||||
$pageData = $this->getPageData();
|
$pageData = $this->getPageData();
|
||||||
$setup = new Setup();
|
$setup = new Setup();
|
||||||
|
|
||||||
$setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
|
|
||||||
|
|
||||||
$setup->addStep(
|
$setup->addStep(
|
||||||
new BackendStep(array(
|
new BackendStep(array(
|
||||||
'backendConfig' => $pageData['setup_monitoring_backend'],
|
'backendConfig' => $pageData['setup_monitoring_backend'],
|
||||||
|
@ -334,17 +334,7 @@ class WebWizard extends Wizard implements SetupWizard
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$configDir = Icinga::app()->getConfigDir();
|
$setup->addStep(new MakeDirStep(array(Config::resolvePath('enabledModules')), 2770));
|
||||||
$setup->addStep(
|
|
||||||
new MakeDirStep(
|
|
||||||
array(
|
|
||||||
$configDir . DIRECTORY_SEPARATOR . 'modules',
|
|
||||||
$configDir . DIRECTORY_SEPARATOR . 'preferences',
|
|
||||||
$configDir . DIRECTORY_SEPARATOR . 'enabledModules'
|
|
||||||
),
|
|
||||||
2770
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
foreach ($this->getWizards() as $wizard) {
|
foreach ($this->getWizards() as $wizard) {
|
||||||
if ($wizard->isComplete()) {
|
if ($wizard->isComplete()) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user