Download as
Browse Code »

Commit 3e581984fecca9ddfbed6082d8f6096c5ff48229

Authored by Dmitriy Zaporozhets
1 parent e14a0eb8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

version updated, gitosis removed

Showing 4 changed files with 10 additions and 23 deletions   Show diff stats
  1 +v 2.0.0
  2 + - gitolite as main git host system
  3 + - merge requests
  4 + - bugfix
  5 +
1 v 1.2.2 6 v 1.2.2
2 - common config file gitlab.yml 7 - common config file gitlab.yml
3 - issues restyle 8 - issues restyle
@@ -9,7 +9,7 @@ GitLab is a free Project/Repository management application @@ -9,7 +9,7 @@ GitLab is a free Project/Repository management application
9 ## Application details 9 ## Application details
10 10
11 rails 3.1 11 rails 3.1
12 -works only with gitosis 12 +works only with gitolite
13 sqlite as default a database 13 sqlite as default a database
14 14
15 ## Requirements 15 ## Requirements
@@ -17,7 +17,7 @@ sqlite as default a database @@ -17,7 +17,7 @@ sqlite as default a database
17 * ruby 1.9.2 17 * ruby 1.9.2
18 * sqlite 18 * sqlite
19 * git 19 * git
20 -* gitosis 20 +* gitolite
21 * ubuntu/debian 21 * ubuntu/debian
22 * pygments lib - `sudo easy_install pygments` 22 * pygments lib - `sudo easy_install pygments`
23 23
@@ -51,7 +51,7 @@ bundle exec rake db:setup RAILS_ENV=production @@ -51,7 +51,7 @@ bundle exec rake db:setup RAILS_ENV=production
51 bundle exec rake db:seed_fu RAILS_ENV=production 51 bundle exec rake db:seed_fu RAILS_ENV=production
52 ``` 52 ```
53 53
54 -Install gitosis, edit `config/gitlab.yml` and start server 54 +Install gitolite (with repo umask 0007), edit `config/gitlab.yml` and start server
55 55
56 ```bash 56 ```bash
57 bundle exec rails s -e production 57 bundle exec rails s -e production
@@ -80,24 +80,9 @@ usermod -a -G git gitlabhq_user_name @@ -80,24 +80,9 @@ usermod -a -G git gitlabhq_user_name
80 80
81 ### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo 81 ### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo
82 82
83 -## Install Gitosis  
84 -  
85 -```bash  
86 -sudo aptitude install gitosis  
87 -  
88 -  
89 -ssh-keygen -t rsa  
90 -  
91 -sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub  
92 -  
93 -sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update  
94 -  
95 -cd /tmp && git clone git@localhost:gitosis-admin.git  
96 -  
97 -rm -rf gitosis-admin.git && cd  
98 -  
99 ``` 83 ```
100 84
  85 +
101 ## Install ruby 1.9.2 86 ## Install ruby 1.9.2
102 87
103 ```bash 88 ```bash
1 -1.2.2 1 +2.0.0
config/gitlab.yml
  Diff comments   View file @3e58198
@@ -7,9 +7,6 @@ email: @@ -7,9 +7,6 @@ email:
7 host: gitlabhq.com 7 host: gitlabhq.com
8 8
9 # Git Hosting 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  
13 git_host: 10 git_host:
14 system: gitolite 11 system: gitolite
15 admin_uri: git@localhost:gitolite-admin 12 admin_uri: git@localhost:gitolite-admin