Commit f7235c53 authored by Robert Schilling's avatar Robert Schilling

Merge pull request #7586 from bbodenmiller/patch-12

[Documentation] simplify 6.0 to 7.2 upgrade guide
parents 4102eb3b 7681f8b0
...@@ -108,7 +108,6 @@ sudo -u git -H bundle install --without development test postgres --deployment ...@@ -108,7 +108,6 @@ sudo -u git -H bundle install --without development test postgres --deployment
# PostgreSQL installations (note: the line below states '--without ... mysql') # PostgreSQL installations (note: the line below states '--without ... mysql')
sudo -u git -H bundle install --without development test mysql --deployment sudo -u git -H bundle install --without development test mysql --deployment
# Run database migrations # Run database migrations
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production 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 ...@@ -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 # Close access to gitlab-satellites for others
sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites 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 ## 7. Update config files
...@@ -146,18 +148,12 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers ...@@ -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 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
``` ```
## 8. Update Init script ## 8. Start application
```bash
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
```
## 9. Start application
sudo service gitlab start sudo service gitlab start
sudo service nginx restart sudo service nginx restart
## 10. Check application status ## 9. Check application status
Check if GitLab and its environment are configured correctly: 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: ...@@ -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! 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. 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/). Ensure that `Contacts API` and the `Google+ API` are enabled in the [Google Developers Console](https://console.developers.google.com/).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment