From 705c495eded552bc6e67856a26e4bdd59778c4c7 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 26 Nov 2013 10:22:04 +0100 Subject: Remove outdated steps from 6.2-to-6.3.md --- doc/update/6.2-to-6.3.md | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index d1c570c9599..94f3c3ecc07 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 @@ -59,29 +52,19 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production sudo -u git -H bundle exec rake 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 @@ -89,12 +72,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6 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: -- cgit v1.2.1 From fecbf9255c6de2ef9e44339726613280c1a28b3d Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 26 Nov 2013 10:22:23 +0100 Subject: No need to re-download the init script --- doc/update/6.2-to-6.3.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index 94f3c3ecc07..a72a7231b76 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -67,8 +67,7 @@ git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.examp ### 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 ``` -- cgit v1.2.1 From 6f17221b7a7861ca077f75ca563888eaab79ad1d Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 26 Nov 2013 10:30:56 +0100 Subject: Fix whitespace --- doc/update/6.2-to-6.3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index a72a7231b76..88b91895f92 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -42,7 +42,7 @@ 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 -- cgit v1.2.1 From c275169a1bdfd6c45ac29be9bc0e4e3d6435a8fb Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 26 Nov 2013 10:31:02 +0100 Subject: Explain and streamline upgrade steps --- doc/update/6.2-to-6.3.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index 88b91895f92..ad4a5095447 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -46,10 +46,11 @@ sudo -u git -H bundle install --without development test postgres --deployment 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 ``` ### 5. Update config files -- cgit v1.2.1