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

Revert "IIS: use 'config' folder within icingaweb root on windows"

Browse Source 
This reverts commit 4607a85cf5745bb99a12f4b5e829447d82c09f6e.
This commit is contained in:
Alexander A. Klimov 2015-06-12 10:38:11 +02:00
parent 4607a85cf5
commit 1e0219f697
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,13 +138,7 @@ abstract class ApplicationBootstrap
if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) { if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
$configDir = $_SERVER['ICINGAWEB_CONFIGDIR']; $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
} else { } else {
// default configuration path. Use /etc/icingaweb2 on linux $configDir = '/etc/icingaweb2';
// For config on windows - use config folder within php code
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$configDir = $baseDir . '/config';
} else {
$configDir = '/etc/icingaweb2';
}
} }
} }
$canonical = realpath($configDir); $canonical = realpath($configDir);