From bc2806bd05b0ab0b0c3bf4f94f9148bbc51469e0 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Fri, 8 Feb 2013 15:33:12 +0100 Subject: [PATCH] Installation procedure update. --- README.md | 11 +++++------ src/config/local.php.dist | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a534a94..6701caf 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,12 @@ __XO is currently under development and may be subject to important bugs.__ _There is currently no package available for XO-Server, you must therefore use the following procedure._ -First of all, you have to download the code, you may either use git `git clone git://github.com/vatesfr/xo-server` or download a [Zip archive](https://github.com/vatesfr/xo-server/archive/master.zip). +1. Download the code, you may either use git `git clone git://github.com/vatesfr/xo-server` or download a [Zip archive](https://github.com/vatesfr/xo-server/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. Finally, run `./src/xo-server`. -XO-Server uses [Composer](https://getcomposer.org) for its dependency management, so all you have to do is `php composer.phar install`. - -Finally, copy `src/config/local.php.dist` to `src/config/local.php` and complete the configuration. - -You are now all set, you may run `./src/xo-server`. +The first time you start XO-Server an `admin` user with the `admin` password is created. ## How to report a bug? diff --git a/src/config/local.php.dist b/src/config/local.php.dist index d4e56cb..2195448 100644 --- a/src/config/local.php.dist +++ b/src/config/local.php.dist @@ -39,7 +39,7 @@ */ return array( - // For now, XCP servers/pools must be defined in this file. + // For now, XCP servers/pool masters must be defined in this file. 'xcp' => array( 'pool 1' => array( 'url' => 'https://xcp1.example.net',