Commit 8af8bee4538baa703085ccc2f44df2c967618ca4

Authored by Cyril Rohr
1 parent 301c4068

Add documentation for new rake task to install gitlab-shell.

Showing 1 changed file with 15 additions and 26 deletions   Show diff stats
doc/install/installation.md
... ... @@ -119,30 +119,7 @@ Create a `git` user for Gitlab:
119 119  
120 120 sudo adduser --disabled-login --gecos 'GitLab' git
121 121  
122   -
123   -# 4. GitLab shell
124   -
125   -GitLab Shell is an ssh access and repository management software developed specially for GitLab.
126   -
127   - # Go to home directory
128   - cd /home/git
129   -
130   - # Clone gitlab shell
131   - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.1
132   -
133   - cd gitlab-shell
134   -
135   - sudo -u git -H cp config.yml.example config.yml
136   -
137   - # Edit config and replace gitlab_url
138   - # with something like 'http://domain.com/'
139   - sudo -u git -H editor config.yml
140   -
141   - # Do setup
142   - sudo -u git -H ./bin/install
143   -
144   -
145   -# 5. Database
  122 +# 4. Database
146 123  
147 124 We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
148 125  
... ... @@ -165,7 +142,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
165 142 sudo -u git -H psql -d gitlabhq_production
166 143  
167 144  
168   -# 6. GitLab
  145 +# 5. GitLab
169 146  
170 147 # We'll install GitLab into home directory of the user "git"
171 148 cd /home/git
... ... @@ -275,6 +252,18 @@ that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2.
275 252  
276 253 # When done you see 'Administrator account created:'
277 254  
  255 +## Install GitLab shell
  256 +
  257 +GitLab Shell is an ssh access and repository management software developed specially for GitLab.
  258 +
  259 + # Go to the Gitlab installation folder:
  260 + cd /home/git/gitlab
  261 +
  262 + # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
  263 + sudo -u git -H bundle exec rake gitlab:shell:setup[v1.9.1] REDIS_URL=redis://localhost:6379
  264 +
  265 + # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows:
  266 + sudo -u git -H editor /home/git/gitlab-shell/config.yml
278 267  
279 268 ## Install Init Script
280 269  
... ... @@ -314,7 +303,7 @@ Check if GitLab and its environment are configured correctly:
314 303 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
315 304  
316 305  
317   -# 7. Nginx
  306 +# 6. Nginx
318 307  
319 308 **Note:**
320 309 Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the
... ...