Commit 761fbbfeea5653e8d01e2d3d7fc936031ad39385
Exists in
spb-stable
and in
2 other branches
Merge branch 'fix-install-guide' into 'master'
Fix install guide Fix gitlab setup. DB setup must go after gitlab-shell setup. Because in seeds we need `/home/git/repositories` to exist
Showing
1 changed file
with
9 additions
and
9 deletions
Show diff stats
doc/install/installation.md
| @@ -244,15 +244,6 @@ that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2. | @@ -244,15 +244,6 @@ that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2. | ||
| 244 | # Or if you use MySQL (note, the option says "without ... postgres") | 244 | # Or if you use MySQL (note, the option says "without ... postgres") |
| 245 | sudo -u git -H bundle install --deployment --without development test postgres aws | 245 | sudo -u git -H bundle install --deployment --without development test postgres aws |
| 246 | 246 | ||
| 247 | - | ||
| 248 | -## Initialize Database and Activate Advanced Features | ||
| 249 | - | ||
| 250 | - sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production | ||
| 251 | - | ||
| 252 | - # Type 'yes' to create the database tables. | ||
| 253 | - | ||
| 254 | - # When done you see 'Administrator account created:' | ||
| 255 | - | ||
| 256 | ## Install GitLab shell | 247 | ## Install GitLab shell |
| 257 | 248 | ||
| 258 | GitLab Shell is an ssh access and repository management software developed specially for GitLab. | 249 | GitLab Shell is an ssh access and repository management software developed specially for GitLab. |
| @@ -266,6 +257,15 @@ GitLab Shell is an ssh access and repository management software developed speci | @@ -266,6 +257,15 @@ GitLab Shell is an ssh access and repository management software developed speci | ||
| 266 | # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: | 257 | # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: |
| 267 | sudo -u git -H editor /home/git/gitlab-shell/config.yml | 258 | sudo -u git -H editor /home/git/gitlab-shell/config.yml |
| 268 | 259 | ||
| 260 | + | ||
| 261 | +## Initialize Database and Activate Advanced Features | ||
| 262 | + | ||
| 263 | + sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production | ||
| 264 | + | ||
| 265 | + # Type 'yes' to create the database tables. | ||
| 266 | + | ||
| 267 | + # When done you see 'Administrator account created:' | ||
| 268 | + | ||
| 269 | ## Install Init Script | 269 | ## Install Init Script |
| 270 | 270 | ||
| 271 | Download the init script (will be /etc/init.d/gitlab): | 271 | Download the init script (will be /etc/init.d/gitlab): |