updated README.md

1 files changed, 76 insertions, 26 deletions

diff --git a/README.md b/README.md
index 641538bb..231aeaa7 100644
--- a/README.md
+++ b/README.md
@@ -1,54 +1,100 @@
+=============
 Leap Platform
 =============
 
 What is it?
------------
+===========
 
 The LEAP Provider Platform is the server-side part of the LEAP Encryption Access Project that is run by service providers. It consists of a set of complementary packages and recipes to automate the maintenance of LEAP services in a hardened GNU/Linux environment. LEAP makes it easy and straightforward for service providers and ISPs to deploy a secure communications platform for their users.
 
 The LEAP Platform is essentially a git repository of puppet recipes, with a few scripts to help with bootstrapping and deployment. A service provider who wants to deploy LEAP services will clone or fork this repository, edit the main configuration file to specify which services should run on which hosts, and run scripts to deploy this configuration.
 
 Documentation
--------------
+=============
+
 Most of the current documentation can be found in Readme files of the different pieces. Eventually this will be consolidated on the website https://leap.se
 
 Requirements
-------------
-This highly depends on your (expected) user base. For a minimal test or develop install we recommend a fairly recent computer x86_64 with hardware virtualization features (AMD-V or VT-x) with plenty of RAM. You could use Vagrant or KVM to simulate a live deployment.
+============
 
-For a live deployment of the platform the amount of required (virtual) servers depends on your needs and which services you want to deploy. In it's initial release you can deploy OpenVPN, DNS, CouchDB and a webapp to administer your users (billing, help tickets,...).
+This highly depends on your (expected) user base. 
+For a minimal test or develop install we recommend a fairly recent computer x86_64 with hardware virtualization features (AMD-V or VT-x) with plenty of RAM. You could use Vagrant or KVM to simulate a live deployment.
 
-To get started you will need to have git, ruby1.8, rails, rubygems, bundler, ruby1.8-dev, libgpgme-ruby. 
+For a live deployment of the platform the amount of required (virtual) servers depends on your needs and which services you want to deploy. 
+In it's initial release you can deploy OpenVPN, CouchDB and a webapp to administer your users (billing, help tickets,...).
+While you can deploy all services on one server, we stronly recommend to use seperate servers for better security.
 
-Configuration
--------------
-Edit config/
+To get started you will need to have git, ruby1.8, rails, rubygems, bundler, ruby1.8-dev, libgpgme-ruby. 
 
 
 Installation
-------------
+============
+
+Create a working directory
+--------------------------
+
+  mkdir ~/Leap
+  cd ~/Leap 
+
+Install leap_cli
+----------------
+
+  git clone git://code.leap.se/leap_cli
+  cd leap_cli
+
+See also README.md for installation hints, but this should work in most cases:
 
-- Edit /etc/leap/hieradata/common.yaml for your needs
-- Run the deploy.sh script as root
+  bundle
+  rake build
+  rake install
+  leap help
 
-git clone git://code.leap.se/leap_platform
-git clone git://code.leap.se/leap_cli
+Install leap_platform
+---------------------
 
-    cd leap_cli
+  cd ~/Leap
+  git clone git://code.leap.se/leap_platform
+  cd leap_platform
+  
+Right now, use the develop branch
 
-    bundle
+  git checkout develop
 
-    cd ..
+Initialize Submodules
 
-git clone git://code.leap.se/leap_testprovider
-ln -s /home/me/dev/leap_cli/bin ~/bin   # or whatever to have leap_cli/bin/leap in your path.
-cd leap_testprovider
-ln -s ../leap_platform .
-cd leap_testprovider/provider
-leap help
-leap clean
-leap compile
-leap add-user --self
+  git submodule init
+  git submodule update
+
+Configuration
+=============
+
+Create config file templates 
+----------------------------
+
+  cd ~/Leap
+  leap init-provider vagrant_test
+  cd vagrant_test
+
+Configure 
+---------
+
+Edit following files: 
+  
+  * common.yaml
+  * nodes/COUCHDB_SERVER.yaml
+  * nodes/WEBAPP_SERVER.yaml
+  * nodes/VPN_SERVER.yaml
+ 
+  leap add-user --self
+  leap compile
+
+Initialize and deploy nodes
+---------------------------
+
+For every server you configured do:
+  
+  leap node-init SERVERNAME
+  leap -v 2 deploy SERVERNAME
 
 More Information
 ----------------
@@ -71,6 +117,10 @@ Troubleshooting
 Changelog
 ---------
 
+For a changelog of the current branch:
+
+  cd ~/Leap
+  git log 
 
 Authors and Credits
 ------------------