diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-02 10:58:37 +0400 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-02 10:58:37 +0400 |
| commit | f7235c5330a28288d0f71f5bb867a596f5c30060 (patch) | |
| tree | 9af46cd995105d02f6fda3ba416b770e8b1e2a22 /doc | |
| parent | 4102eb3b85a1a9d43bebe116066719e6b0872566 (diff) | |
| parent | 7681f8b0f7995d64d6f4bfc0c89d66bbb08af94a (diff) | |
Merge pull request #7586 from bbodenmiller/patch-12
[Documentation] simplify 6.0 to 7.2 upgrade guide
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/6.0-to-7.2.md | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/doc/update/6.0-to-7.2.md b/doc/update/6.0-to-7.2.md index 51e260b9e62..770519a46e0 100644 --- a/doc/update/6.0-to-7.2.md +++ b/doc/update/6.0-to-7.2.md @@ -108,7 +108,6 @@ sudo -u git -H bundle install --without development test postgres --deployment # PostgreSQL installations (note: the line below states '--without ... mysql') sudo -u git -H bundle install --without development test mysql --deployment - # Run database migrations sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production @@ -120,6 +119,9 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS # Close access to gitlab-satellites for others sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites + +# Update init.d script +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab ``` ## 7. Update config files @@ -146,18 +148,12 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab ``` -## 8. Update Init script - -```bash -sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab -``` - -## 9. Start application +## 8. Start application sudo service gitlab start sudo service nginx restart -## 10. Check application status +## 9. Check application status Check if GitLab and its environment are configured correctly: @@ -170,7 +166,7 @@ To make sure you didn't miss anything run a more thorough check with: If all items are green, then congratulations upgrade complete! -## 11. Update OmniAuth configuration +## 10. Update OmniAuth configuration When using Google omniauth login, changes of the Google account required. Ensure that `Contacts API` and the `Google+ API` are enabled in the [Google Developers Console](https://console.developers.google.com/). |