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

packaging/config: rename ICINGA_APPDIR 

Renamed ICINGA_APPDIR to ICINGAWEB_APPDIR for consistency. This way
it fits ICINGAWEB_CONFIGDIR.

refs #6400
This commit is contained in:
Thomas Gelf 2014-06-04 21:11:27 +00:00
parent e992f152bb
commit 55880cb5a3
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/clicommands/WebCommand.php
View File

@ -29,7 +29,7 @@ class WebCommand extends Command
// throw new Exception('Socket is required'); // throw new Exception('Socket is required');
} }
if ($basedir === null) { if ($basedir === null) {
$basedir = dirname(ICINGA_APPDIR) . '/public'; $basedir = dirname(ICINGAWEB_APPDIR) . '/public';
if (! file_exists($basedir) || ! is_dir($basedir)) { if (! file_exists($basedir) || ! is_dir($basedir)) {
throw new Exception('Basedir is required'); throw new Exception('Basedir is required');
} }

2
application/forms/Config/GeneralForm.php
View File

@ -248,7 +248,7 @@ class GeneralForm extends Form
'helptext' => 'Contains the directories that will be searched for available modules, separated by ' . 'helptext' => 'Contains the directories that will be searched for available modules, separated by ' .
' colons. Modules that don\'t exist in these directories can still be symlinked in the module ' . ' colons. Modules that don\'t exist in these directories can still be symlinked in the module ' .
' folder, but won\'t show up in the list of disabled modules.', ' folder, but won\'t show up in the list of disabled modules.',
'value' => $cfg->get('modulePath', realpath(ICINGA_APPDIR . '/../modules')) 'value' => $cfg->get('modulePath', realpath(ICINGAWEB_APPDIR . '/../modules'))
) )
); );
} }

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

@ -136,8 +136,8 @@ abstract class ApplicationBootstrap
// TODO: Make appdir configurable for packagers // TODO: Make appdir configurable for packagers
$this->appDir = realpath($this->libDir. '/../application'); $this->appDir = realpath($this->libDir. '/../application');
if (!defined('ICINGA_APPDIR')) { if (!defined('ICINGAWEB_APPDIR')) {
define('ICINGA_APPDIR', $this->appDir); define('ICINGAWEB_APPDIR', $this->appDir);
} }
if ($configDir === null) { if ($configDir === null) {
@ -337,8 +337,8 @@ abstract class ApplicationBootstrap
explode( explode(
':', ':',
$this->config->global !== null $this->config->global !== null
? $this->config->global->get('modulePath', ICINGA_APPDIR . '/../modules') ? $this->config->global->get('modulePath', ICINGAWEB_APPDIR . '/../modules')
: ICINGA_APPDIR . '/../modules' : ICINGAWEB_APPDIR . '/../modules'
) )
); );
return $this; return $this;

2
library/Icinga/Cli/Loader.php
View File

@ -64,7 +64,7 @@ class Loader
public function __construct(App $app) public function __construct(App $app)
{ {
$this->app = $app; $this->app = $app;
$this->coreAppDir = ICINGA_APPDIR . '/clicommands'; $this->coreAppDir = ICINGAWEB_APPDIR . '/clicommands';
} }
/** /**

4
test/php/bootstrap.php
View File

@ -7,8 +7,8 @@ $testLibraryPath = realpath(dirname(__FILE__) . '/library/');
$configPath = realpath($libraryPath . '/../config'); $configPath = realpath($libraryPath . '/../config');
// Is usually done in the application's bootstrap and is used by some of our internals // Is usually done in the application's bootstrap and is used by some of our internals
if (!defined('ICINGA_APPDIR')) { if (!defined('ICINGAWEB_APPDIR')) {
define('ICINGA_APPDIR', $applicationPath); define('ICINGAWEB_APPDIR', $applicationPath);
} }
if (!defined('ICINGA_LIBDIR')) { if (!defined('ICINGA_LIBDIR')) {
define('ICINGA_LIBDIR', $libraryPath); define('ICINGA_LIBDIR', $libraryPath);