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

Prepare icingacli for having the Icinga library in PHP's include path

This commit is contained in:
Eric Lippmann 2014-11-12 13:13:39 +01:00
parent 8c9465ffbd
commit 921f324d3e
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/icingacli
View File

@ -1,6 +1,17 @@
#!/usr/bin/php
<?php
use Icinga\Application\Cli;
require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
Cli::start()->dispatch();
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
define('ICINGAWEB_BASEDIR', dirname(__DIR__));
// ICINGAWEB_BASEDIR is the parent folder for at least application, bin, modules, library/vendor and public
if (! @include_once ICINGAWEB_BASEDIR . 'Icinga/Application/Cli.php') {
// If the Icinga library wasn't found under ICINGAWEB_BASEDIR, require that the Icinga library is found in PHP's
// include path which is the case if Icinga Web 2 is installed via packages
require_once 'Icinga/Application/Cli.php';
}
Icinga\Application\Cli::start()->dispatch();

2
public/index.php
View File

@ -3,7 +3,7 @@
// {{{ICINGA_LICENSE_HEADER}}}
define('ICINGAWEB_BASEDIR', dirname(__DIR__));
// ICINGAWEB_BASEDIR is the parent folder for at least application, bin, modules and public
// ICINGAWEB_BASEDIR is the parent folder for at least application, bin, modules, library/vendor and public
if (! @include_once ICINGAWEB_BASEDIR . '/library/Icinga/Application/webrouter.php') {