Commit a41d57691d47dce8db788d6cf97031bf1321a792

Authored by Dmitriy Zaporozhets
1 parent 9e089efe

updated README

Showing 2 changed files with 24 additions and 4 deletions   Show diff stats
@@ -29,7 +29,8 @@ git clone git://github.com/gitlabhq/gitlabhq.git @@ -29,7 +29,8 @@ git clone git://github.com/gitlabhq/gitlabhq.git
29 cd gitlabhq/ 29 cd gitlabhq/
30 30
31 # install this library first 31 # install this library first
32 -sudo easy_install pygments 32 +sudo pip install pygments
  33 +sudo apt-get install python-dev
33 34
34 # give your user access to remove git repo 35 # give your user access to remove git repo
35 # Ex. 36 # Ex.
@@ -56,10 +57,9 @@ Install gitosis, edit `config/gitlab.yml` and start server @@ -56,10 +57,9 @@ Install gitosis, edit `config/gitlab.yml` and start server
56 bundle exec rails s -e production 57 bundle exec rails s -e production
57 ``` 58 ```
58 59
59 -## Install Gitosis 60 +### Create git user
60 61
61 ```bash 62 ```bash
62 -sudo aptitude install gitosis  
63 63
64 sudo adduser \ 64 sudo adduser \
65 --system \ 65 --system \
@@ -70,6 +70,22 @@ sudo adduser \ @@ -70,6 +70,22 @@ sudo adduser \
70 --home /home/git \ 70 --home /home/git \
71 git 71 git
72 72
  73 +
  74 +# Add your user to git group
  75 +usermod -a -G git gitlabhq_user_name
  76 +
  77 +```
  78 +
  79 +## Install Gitolite
  80 +
  81 +### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo
  82 +
  83 +## Install Gitosis
  84 +
  85 +```bash
  86 +sudo aptitude install gitosis
  87 +
  88 +
73 ssh-keygen -t rsa 89 ssh-keygen -t rsa
74 90
75 sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub 91 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 @@ -79,6 +95,7 @@ sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update
79 cd /tmp && git clone git@localhost:gitosis-admin.git 95 cd /tmp && git clone git@localhost:gitosis-admin.git
80 96
81 rm -rf gitosis-admin.git && cd 97 rm -rf gitosis-admin.git && cd
  98 +
82 ``` 99 ```
83 100
84 ## Install ruby 1.9.2 101 ## Install ruby 1.9.2
config/gitlab.yml
@@ -6,7 +6,10 @@ email: @@ -6,7 +6,10 @@ email:
6 from: notify@gitlabhq.com 6 from: notify@gitlabhq.com
7 host: gitlabhq.com 7 host: gitlabhq.com
8 8
9 -# Gitosis congiguration 9 +# Git Hosting congiguration
  10 +# You can use both gitolite & gitosis
  11 +# But gitosis wiil be deprecated &
  12 +# some new features wont work with it
10 git_host: 13 git_host:
11 system: gitolite# or gitosis 14 system: gitolite# or gitosis
12 admin_uri: git@localhost:gitolite-admin 15 admin_uri: git@localhost:gitolite-admin