More work on the INSTALL instructions.

1 files changed, 37 insertions, 10 deletions

diff --git a/INSTALL b/INSTALL
index 8e53965..fce9d8a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,6 +37,8 @@ Dependencies
  * postgresql-9.1
  * postgresql-server-dev-9.1
  * python
+ * python-amqplib
+ * python-anyjson
  * python-babel
  * python-bcrypt
  * python-celery
@@ -44,6 +46,7 @@ Dependencies
  * python-dev
  * python-docutils
  * python-formencode
+ * python-mailer
  * python-markdown
  * python-nose
  * python-pastescript
@@ -70,8 +73,8 @@ The RhodeCode installation will be done with a dedicated system user and group.
 Necessary Directories
 ---------------------
 
-The following directories need to be writable at least by the 'rhodecode' user
-and/or group:
+The following directories need to created and be writable at least by the
+'rhodecode' user and/or group:
 
  * /var/log/celery
  * /var/log/rhodecode
@@ -128,20 +131,44 @@ the correct values. The lines to modify are:
 The default config file assumes RabbitMQ to be installed on the same host of
 RhodeCode.
 
-== Clone Rhodecode from git ==
+For more information about Celery and RabbitMQ configurations:
 
-git clone git://github.com/marcinkuzminski/rhodecode.git
-cd rhodecode && git checkout v1.5.1
+ http://docs.celeryproject.org/en/master/getting-started/brokers/rabbitmq.html
 
-== Install Rhodecode ==
+Download, Setup and Install RhodeCode
+-------------------------------------
 
-python setup.py install
+We install RhodeCode from source, from a Linaro dedicated branch, wich might
+contain changes applied by us. All these operation are assumed to be performed
+under the 'rhodecode' home directoy.
 
-= Setup rhodecode =
+ * Clone the 'rhodecode' repository from git.linaro.org:
 
-#Get our configuration from git repository instructions should go here.
+    git clone git://github.com/marcinkuzminski/rhodecode.git
 
-== Start Rhodecode ==
+ * Move in the 'rhodecode' directory, checkout the decicated branch and update:
+
+    cd rhodecode && git checkout linaro && git pull origin linaro
+
+ * Set up RhodeCode, always as the 'rhodecode' user and in the 'rhodecode' git
+   directory:
+
+    paster setup-rhodecode $CONF_FILE --user=$USER --email=$EMAL \
+    --password=$PWD --repos=$REPOS
+
+   The variable means:
+   * $CONF_FILE: path to the 'production.ini' file
+   * $USER: the name for the administrator user on the website
+   * $EMAIL: the email of the administrator
+   * $PWD: the password for the administrator
+   * $REPOS: the path of the directory where the git repositories will be saved,
+     as per these instructions it should be '/opt/git_repos'
+
+ * Install RhodeCode, using the 'rhodecode' user home directory as the base:
+    python setup.py install --user
+
+Start the services
+------------------
 
 paster serve production.ini