diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-26 18:34:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-26 18:34:18 +0000 |
| commit | 51b5509bacdfba1d3ca84a4b56c6bd21942f1d2e (patch) | |
| tree | e5b773d15dd3279ba82e22b37d7f188c3dff7ed3 | |
| parent | 8c7d342a284a53da80c9028f73eb8fa3ed83af28 (diff) | |
| parent | c275169a1bdfd6c45ac29be9bc0e4e3d6435a8fb (diff) | |
| download | gitlab-ce-51b5509bacdfba1d3ca84a4b56c6bd21942f1d2e.tar.gz | |
Merge branch '6_3_update' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | doc/update/6.2-to-6.3.md | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index d1c570c9599..ad4a5095447 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -34,14 +34,7 @@ sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulner The Gitlab-shell config changed recently, so check for config file changes and make `/home/git/gitlab-shell/config.yml` the same as https://github.com/gitlabhq/gitlab-shell/blob/master/config.yml.example -### 4. Install additional packages - -```bash -# Add support for lograte for better log file handling -sudo apt-get install logrotate -``` - -### 5. Install libs, migrations, etc. +### 4. Install libs, migrations, etc. ```bash cd /home/git/gitlab @@ -49,52 +42,42 @@ cd /home/git/gitlab # MySQL sudo -u git -H bundle install --without development test postgres --deployment -#PostgreSQL +# PostgreSQL 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 -sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production -sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production -sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production + +# Clean up assets and cache +sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production ``` -### 6. Update config files +### 5. Update config files TIP: to see what changed in gitlab.yml.example in this release use next command: ``` git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example -git diff 6-1-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example # if you upgrading from 6-1 ``` * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/gitlab.yml.example but with your settings. * Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/unicorn.rb.example but with your settings. * Copy rack attack middleware config -```bash -sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb -``` -* Set up logrotate - -```bash -sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab -``` - -### 7. Update Init script +### 6. Update Init script ```bash -sudo rm /etc/init.d/gitlab -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-3-stable/lib/support/init.d/gitlab +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab sudo chmod +x /etc/init.d/gitlab ``` -### 8. Start application +### 7. Start application sudo service gitlab start sudo service nginx restart -### 9. Check application status +### 8. Check application status Check if GitLab and its environment are configured correctly: |