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

Don't use /etc/icingaweb2 as config path on Windows 

fixes #8916
This commit is contained in:
Alexander A. Klimov 2015-06-12 11:09:28 +02:00
parent 0bce5e83ad
commit 48870bb7e2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,18 +134,20 @@ abstract class ApplicationBootstrap
$this->vendorDir = $baseDir . '/library/vendor'; $this->vendorDir = $baseDir . '/library/vendor';
$this->libDir = realpath(__DIR__ . '/../..'); $this->libDir = realpath(__DIR__ . '/../..');
$this->setupAutoloader();
if ($configDir === null) { if ($configDir === null) {
if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) { if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
$configDir = $_SERVER['ICINGAWEB_CONFIGDIR']; $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
} else { } else {
$configDir = '/etc/icingaweb2'; $configDir = Platform::isWindows()
? $baseDir . DIRECTORY_SEPARATOR . 'config'
: '/etc/icingaweb2';
} }
} }
$canonical = realpath($configDir); $canonical = realpath($configDir);
$this->configDir = $canonical ? $canonical : $configDir; $this->configDir = $canonical ? $canonical : $configDir;
$this->setupAutoloader();
set_include_path( set_include_path(
implode( implode(
PATH_SEPARATOR, PATH_SEPARATOR,