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

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

Browse Source 
This reverts commit 48870bb7e2ed392a6898591b20eace0c96f54993.
This commit is contained in:
Alexander A. Klimov 2015-06-12 13:29:36 +02:00
parent b58ffbe034
commit 7ea6eeb20d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,20 +134,18 @@ 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 = Platform::isWindows() $configDir = '/etc/icingaweb2';
? $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,