summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-26 10:22:04 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-26 10:22:04 +0100
commit705c495eded552bc6e67856a26e4bdd59778c4c7 (patch)
treea4971d60be725c34906ea07fe129807c6cfb77a3 /doc
parentc57180367c8a9e55beb378fc7d0fd3c1cc1497e5 (diff)
downloadgitlab-ce-705c495eded552bc6e67856a26e4bdd59778c4c7.tar.gz
Remove outdated steps from 6.2-to-6.3.md
Diffstat (limited to 'doc')
-rw-r--r--doc/update/6.2-to-6.3.md27
1 files 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: