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

More consistent default config dir handling, less configuration

This commit is contained in:
Thomas Gelf 2014-04-17 16:59:10 +00:00
parent 3b20833495
commit 5fdec39475
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/icingacli
View File

@ -3,4 +3,4 @@
use Icinga\Application\Cli;
require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
Cli::start('@icingaweb_config_path@')->dispatch();
Cli::start()->dispatch();

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

@ -10,12 +10,6 @@ use Icinga\Chart\Inline\PieChart;
error_reporting(E_ALL | E_STRICT);
if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
$configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
} else {
$configDir = '/etc/icingaweb';
}
if (isset($_SERVER['REQUEST_URI'])) {
$ruri = $_SERVER['REQUEST_URI'];
} else {
@ -59,7 +53,7 @@ $special = array(
if (in_array($path, $special)) {
include_once __DIR__ . '/EmbeddedWeb.php';
EmbeddedWeb::start($configDir);
EmbeddedWeb::start();
switch($path) {
@ -87,7 +81,7 @@ if (in_array($path, $special)) {
return false;
}
include __DIR__ . '/EmbeddedWeb.php';
EmbeddedWeb::start($configDir);
EmbeddedWeb::start();
header('Content-Type: image/svg+xml');
$pie = new PieChart();
$pie->initFromRequest();
@ -97,6 +91,6 @@ if (in_array($path, $special)) {
return false;
} else {
include __DIR__ . '/Web.php';
Web::start($configDir)->dispatch();
Web::start()->dispatch();
}