From 7681f8b0f7995d64d6f4bfc0c89d66bbb08af94a Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 1 Sep 2014 16:41:37 -0700 Subject: [PATCH] simplify 6.0 to 7.2 upgrade guide --- doc/update/6.0-to-7.2.md | 16 ++++++---------- 1 file 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 bb756460233..5bcd8cab903 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/).