NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

README update.

Browse Source
This commit is contained in:
Julien Fontanet 2013-02-08 15:46:59 +01:00
parent 0b580f6d30
commit 20d6e258b0
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -2,7 +2,7 @@
XO-Web is part of [Xen Orchestra](https://github.com/vatesfr/xo), a web interface for [XCP](https://en.wikipedia.org/wiki/Xen_Cloud_Platform).
It is a web client for [XO-Server](https://github.com/vatesfr/xo-web).
It is a web client for [XO-Server](https://github.com/vatesfr/xo-server).
__XO is currently under development and may be subject to important bugs.__
@ -12,8 +12,7 @@ _There is currently no package available for XO-Web, you must therefore use the
1. Download the code, you may either use git `git clone git://github.com/vatesfr/xo-web` or download a [Zip archive](https://github.com/vatesfr/xo-web/archive/master.zip).
2. XO-Web uses [Composer](https://getcomposer.org) for its dependency management, so, once you have [installed it](https://getcomposer.org/download/), juste run `php composer.phar install`.
3. Copy `src/config/local.php.dist` to `src/config/local.php` and complete the configuration.
4. Makes sure the `src/www` directory and all its content is available from your web server.
3. Makes sure the `src/www` directory and all its content is available from your web server.
## How to report a bug?

17
src/bootstrap.php
View File

@ -43,10 +43,19 @@ function _bootstrap()
require($root_dir.'/../vendor/autoload.php');
// Reads configuration.
$config = new Config(array_merge_recursive(
require($root_dir.'/config/global.php'),
require($root_dir.'/config/local.php')
));
$config = array();
foreach (array('global', 'local') as $file)
{
$file = $root_dir.'/config/'.$file.'.php';
if (is_file($file))
{
$config = array_merge_recursive(
$config,
require($file)
);
}
}
$config = new Config($config);
// Injects some variables.
$config->set('root_dir', $root_dir);

2
src/config/local.php.dist
View File

@ -29,7 +29,7 @@
/* Local settings
*
* This file contains all settings related to this current
* installation of Xen Orchestra Server.
* installation of Xen Orchestra Web.
*
* You MUST define the following settings for which no default
* values exists.