From a41d57691d47dce8db788d6cf97031bf1321a792 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 4 Dec 2011 01:52:19 +0200
Subject: [PATCH] updated README

---
 README.md         | 23 ++++++++++++++++++++---
 config/gitlab.yml |  5 ++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 766d18cca05..12a0aba709c 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,8 @@ git clone git://github.com/gitlabhq/gitlabhq.git
 cd gitlabhq/
 
 # install this library first
-sudo easy_install pygments
+sudo pip install pygments
+sudo apt-get install python-dev
 
 # give your user access to remove git repo
 # Ex.
@@ -56,10 +57,9 @@ Install gitosis, edit `config/gitlab.yml` and start server
 bundle exec rails s -e production
 ```
 
-## Install Gitosis
+### Create git user 
 
 ```bash
-sudo aptitude install gitosis
 
 sudo adduser \
   --system \
@@ -70,6 +70,22 @@ sudo adduser \
   --home /home/git \
   git
 
+
+# Add your user to git group
+usermod -a -G git gitlabhq_user_name 
+
+```
+
+## Install Gitolite
+
+### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo
+
+## Install Gitosis
+
+```bash
+sudo aptitude install gitosis
+
+
 ssh-keygen -t rsa
 
 sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
@@ -79,6 +95,7 @@ sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update
 cd /tmp && git clone git@localhost:gitosis-admin.git 
 
 rm -rf gitosis-admin.git && cd
+
 ```
 
 ## Install ruby 1.9.2
diff --git a/config/gitlab.yml b/config/gitlab.yml
index c61d382f65b..5e85af788b4 100644
--- a/config/gitlab.yml
+++ b/config/gitlab.yml
@@ -6,7 +6,10 @@ email:
   from: notify@gitlabhq.com
   host: gitlabhq.com
 
-# Gitosis congiguration
+# Git Hosting congiguration
+# You can use both gitolite & gitosis
+# But gitosis wiil be deprecated & 
+# some new features wont work with it
 git_host:
   system: gitolite# or gitosis
   admin_uri: git@localhost:gitolite-admin