Install postfix separately, new update instructions. Fixes #3639

1 files changed, 27 insertions, 14 deletions

diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md
index 9e6df65dddb..708d33ecb6f 100644
--- a/doc/update/5.0-to-5.1.md
+++ b/doc/update/5.0-to-5.1.md
@@ -3,36 +3,39 @@
 * `unicorn` replaced with `puma`
 * merge request cached diff will be truncated
 
-### 1. stop server
+### 1. Stop server
 
     sudo service gitlab stop
 
-### 2. get latest code
-
-```
+### 2. Get latest code
 
+```bash
+cd /home/git/gitlab
 sudo -u git -H git fetch
 sudo -u git -H git checkout 5-1-stable
-
 ```
 
-### 3. Install libs, migrations etc
+### 3. Update gitlab-shell
 
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v1.3.0
 ```
-sudo -u git -H cp config/puma.rb.example config/puma.rb
 
-# Mysql users:
-sudo -u git -H bundle install --without development test postgres --deployment
+### 4. Install libs, migrations etc
 
-# Postgres users:
-sudo -u git -H bundle install --without development test mysql --deployment
+```bash
+cd /home/git/gitlab
+sudo rm tmp/sockets/gitlab.socket
+sudo -u git -H cp config/puma.rb.example config/puma.rb
 
+sudo -u git -H bundle install --without development test postgres --deployment
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake migrate_merge_requests RAILS_ENV=production
-
 ```
 
-### 4. Update init.d script with a new one
+### 5. Update init.d script with a new one
 
 ```bash
 # init.d
@@ -41,6 +44,16 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-rec
 sudo chmod +x /etc/init.d/gitlab
 ```
 
-### 5. Start application
+### 6. Mysql grant privileges
+
+Only if you are using mysql:
+
+```bash
+mysql -u root -p
+mysql> GRANT LOCK TABLES ON `gitlabhq_production`.* TO 'gitlab'@'localhost';
+mysql> \q
+```
+
+### 7. Start application
 
     sudo service gitlab start