updated gems & readme

Dmitriy Zaporozhets
1 parent 415d09be
Showing 3 changed files with 28 additions and 5 deletions Show diff stats
Gemfile
Gemfile.lock
README.md
@@ -9,7 +9,7 @@ gem &quot;kaminari&quot;
 gem "haml-rails"
 gem "jquery-rails"
 gem "grit", :git => "https://github.com/gitlabhq/grit.git"
-gem "gitolite", :git => "https://github.com/gitlabhq/gitolite.git"
+gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git"
 gem "carrierwave"
 gem "six"
 gem "therubyracer"
@@ -5,7 +5,7 @@ GIT
     annotate (2.4.1.beta1)
  
 GIT
-  remote: https://github.com/gitlabhq/gitolite.git
+  remote: https://github.com/gitlabhq/gitolite-client.git
   revision: 36dabd226caa40ff052677719adaacbfe667b36c
   specs:
     gitolite (0.0.3.alpha)
@@ -57,10 +57,14 @@ Install gitolite (with repo umask 0007), edit `config/gitlab.yml` and start serv
 bundle exec rails s -e production
 ```
  
-### Create git user 
+
+## Install Gitolite
+
  
 ```bash
  
+
+# create git user
 sudo adduser \
   --system \
   --shell /bin/sh \
@@ -76,9 +80,28 @@ usermod -a -G git gitlabhq_user_name
  
 ```
  
-## Install Gitolite
+### !!! IMPORTANT !!! Gitolite should have repository umask 0007 so users from git group has read/write access to repo
+
+```bash
+
+# copy your pub key to git home
+cp ~/.ssh/id_rsa.pub /home/git/rails.pub
  
-### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo
+# enter user git
+sudo -i -u git 
+
+# clone gitolite
+git clone git://github.com/gitlabhq/gitolite
+
+# install gitolite
+gitolite/src/gl-system-install
+
+
+# Setup (Dont forget to set umask as 0007!!)
+gl-setup ~/rails.pub
+
+
+```
  
  
 ## Install ruby 1.9.2
...	...	@@ -9,7 +9,7 @@ gem "kaminari"
9	9	gem "haml-rails"
10	10	gem "jquery-rails"
11	11	gem "grit", :git => "https://github.com/gitlabhq/grit.git"
12		-gem "gitolite", :git => "https://github.com/gitlabhq/gitolite.git"
	12	+gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git"
13	13	gem "carrierwave"
14	14	gem "six"
15	15	gem "therubyracer"
...	...
...	...	@@ -5,7 +5,7 @@ GIT
5	5	annotate (2.4.1.beta1)
6	6
7	7	GIT
8		- remote: https://github.com/gitlabhq/gitolite.git
	8	+ remote: https://github.com/gitlabhq/gitolite-client.git
9	9	revision: 36dabd226caa40ff052677719adaacbfe667b36c
10	10	specs:
11	11	gitolite (0.0.3.alpha)
...	...
...	...	@@ -57,10 +57,14 @@ Install gitolite (with repo umask 0007), edit `config/gitlab.yml` and start serv
57	57	bundle exec rails s -e production
58	58	```
59	59
60		-### Create git user
	60	+
	61	+## Install Gitolite
	62	+
61	63
62	64	```bash
63	65
	66	+
	67	+# create git user
64	68	sudo adduser \
65	69	--system \
66	70	--shell /bin/sh \
...	...	@@ -76,9 +80,28 @@ usermod -a -G git gitlabhq_user_name
76	80
77	81	```
78	82
79		-## Install Gitolite
	83	+### !!! IMPORTANT !!! Gitolite should have repository umask 0007 so users from git group has read/write access to repo
	84	+
	85	+```bash
	86	+
	87	+# copy your pub key to git home
	88	+cp ~/.ssh/id_rsa.pub /home/git/rails.pub
80	89
81		-### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo
	90	+# enter user git
	91	+sudo -i -u git
	92	+
	93	+# clone gitolite
	94	+git clone git://github.com/gitlabhq/gitolite
	95	+
	96	+# install gitolite
	97	+gitolite/src/gl-system-install
	98	+
	99	+
	100	+# Setup (Dont forget to set umask as 0007!!)
	101	+gl-setup ~/rails.pub
	102	+
	103	+
	104	+```
82	105
83	106
84	107	## Install ruby 1.9.2
...	...