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

icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR"

This commit is contained in:
Eric Lippmann 2014-11-14 16:02:17 +01:00
parent ce69300c9a
commit 11bb8dbab0
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/clicommands/WebCommand.php
View File

@ -47,7 +47,7 @@ class WebCommand extends Command
readlink('/proc/self/exe'), readlink('/proc/self/exe'),
$socket, $socket,
$basedir, $basedir,
ICINGA_LIBDIR . '/Icinga/Application/webrouter.php' Icinga::app()->getLibraryDir('/Icinga/Application/webrouter.php')
); );
// TODO: Store webserver log, switch uid, log index.php includes, pid file // TODO: Store webserver log, switch uid, log index.php includes, pid file

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

@ -275,6 +275,18 @@ abstract class ApplicationBootstrap
return $this->getDirWithSubDir($this->configDir, $subDir); return $this->getDirWithSubDir($this->configDir, $subDir);
} }
/**
* Get the Icinga library directory
*
* @param string $subDir Optional sub directory to get
*
* @return string
*/
public function getLibraryDir($subDir = null)
{
return $this->getDirWithSubDir($this->libDir, $subDir);
}
/** /**
* Get the path to the bootstrapping directory * Get the path to the bootstrapping directory
* *