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

Revert "Create sub directories with the CLI's setup command as well" 

This reverts commit 9589919ae8.
This commit is contained in:
Johannes Meyer 2014-10-28 09:34:28 +01:00
parent 1fd4a301c4
commit 85f7dcf825
1 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
application/clicommands/SetupCommand.php
View File

@ -100,45 +100,22 @@ class SetupCommand extends Command
return false;
}
$configPath = $this->params->get('path', $this->app->getConfigDir());
if (file_exists($configPath)) {
$this->fail(sprintf($this->translate('Path "%s" already exists.'), $configPath));
return false;
}
if (false === mkdir($configPath)) {
$this->fail(sprintf($this->translate('Unable to create path: %s'), $configPath));
return false;
}
$moduleConfigPath = $configPath . '/modules';
if (false === mkdir($moduleConfigPath)) {
$this->fail(sprintf($this->translate('Unable to create path: %s'), $moduleConfigPath));
return false;
}
$preferencesPath = $configPath . '/preferences';
if (false === mkdir($preferencesPath)) {
$this->fail(sprintf($this->translate('Unable to create path: %s'), $preferencesPath));
return false;
}
$enabledModulesPath = $configPath . '/enabledModules';
if (false === mkdir($enabledModulesPath)) {
$this->fail(sprintf($this->translate('Unable to create path: %s'), $enabledModulesPath));
$path = $this->params->get('path', $this->app->getConfigDir());
if (file_exists($path)) {
$this->fail(sprintf($this->translate('Path "%s" already exists.'), $path));
return false;
}
$mode = octdec($this->params->get('mode', '2775'));
if (false === mkdir($path)) {
$this->fail(sprintf($this->translate('Unable to create path: %s'), $path));
return false;
}
$old = umask(0); // Prevent $mode from being mangled by the system's umask ($old)
chmod($configPath, $mode);
chmod($moduleConfigPath, $mode);
chmod($preferencesPath, $mode);
chmod($enabledModulesPath, $mode);
chmod($path, $mode);
umask($old);
chgrp($configPath, $group);
chgrp($moduleConfigPath, $group);
chgrp($preferencesPath, $group);
chgrp($enabledModulesPath, $group);
chgrp($path, $group);
}
/**