Updates to the update/install docs for 7.3.rc1

3 files changed, 158 insertions, 24 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index ce9d45526d0..6a981984fea 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -155,9 +155,9 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 ### Clone the Source
 
     # Clone GitLab repository
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-2-stable gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-3-stable gitlab
 
-**Note:** You can change `7-2-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `7-3-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ### Configure It
 
@@ -192,7 +192,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 
     # Find number of cores
     nproc
-    
+
     # Enable cluster mode if you expect to have a high load instance
     # Ex. change amount of workers to 3 for 2GB RAM server
     # Set the number of workers to at least the number of cores
diff --git a/doc/update/6.0-to-7.2.md b/doc/update/6.0-to-7.3.md
index 8dfcbcdd056..0f67209f8ff 100644
--- a/doc/update/6.0-to-7.2.md
+++ b/doc/update/6.0-to-7.3.md
@@ -1,4 +1,6 @@
-# From 6.0 to 7.2
+# From 6.0 to 7.3
+
+# GitLab 7.3 has not been released yet!
 
 ## Global issue numbers
 
@@ -67,7 +69,7 @@ sudo -u git -H git fetch --all
 For GitLab Community Edition:
 
 ```bash
-sudo -u git -H git checkout 7-2-stable
+sudo -u git -H git checkout 7-3-stable
 ```
 
 OR
@@ -75,7 +77,7 @@ OR
 For GitLab Enterprise Edition:
 
 ```bash
-sudo -u git -H git checkout 7-2-stable-ee
+sudo -u git -H git checkout 7-3-stable-ee
 ```
 
 
@@ -89,15 +91,35 @@ sudo apt-get install logrotate
 sudo apt-get install pkg-config cmake
 ```
 
-## 5. Update gitlab-shell
+## 5. Configure Redis to use sockets
+
+    # Configure redis to use sockets
+    sudo cp /etc/redis/redis.conf /etc/redis/redis.conf.orig
+    sed -e 's/^# unixsocket /unixsocket /' -e 's/^port .*/port 0/' /etc/redis/redis.conf.orig | sudo tee /etc/redis/redis.conf
+    # Activate the changes to redis.conf
+    sudo service redis-server restart
+    # Add git to the redis group
+    sudo usermod -aG redis git
+
+    cd /home/git/gitlab
+    # Configure Redis connection settings
+    sudo -u git -H cp config/resque.yml.example config/resque.yml
+    # Change the Redis socket path if necessary
+    sudo -u git -H editor config/resque.yml
+
+    cd /home/git/gitlab-shell
+    # Configure gitlab-shell to use Redis sockets
+    sudo -u git -H sed -i 's|^  # socket.*|  socket: /var/run/redis/redis.sock|' config.yml
+
+## 6. Update gitlab-shell
 
 ```bash
 cd /home/git/gitlab-shell
 sudo -u git -H git fetch
-sudo -u git -H git checkout v1.9.7
+sudo -u git -H git checkout v2.0.0
 ```
 
-## 6. Install libs, migrations, etc.
+## 7. Install libs, migrations, etc.
 
 ```bash
 cd /home/git/gitlab
@@ -124,19 +146,19 @@ sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 ```
 
-## 7. Update config files
+## 8. Update config files
 
 TIP: to see what changed in gitlab.yml.example in this release use next command:
 
 ```
-git diff 6-0-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-3-stable:config/gitlab.yml.example
 ```
 
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-stable/config/unicorn.rb.example but with your settings.
-* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v1.9.7/config.yml.example but with your settings.
-* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-stable/lib/support/nginx/gitlab but with your settings.
-* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-stable/lib/support/nginx/gitlab-ssl but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.0.0/config.yml.example but with your settings.
+* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/lib/support/nginx/gitlab-ssl but with your settings.
 * Copy rack attack middleware config
 
 ```bash
@@ -149,12 +171,12 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers
 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 ```
 
-## 8. Start application
+## 9. Start application
 
     sudo service gitlab start
     sudo service nginx restart
 
-## 9. Check application status
+## 10. Check application status
 
 Check if GitLab and its environment are configured correctly:
 
@@ -167,7 +189,7 @@ To make sure you didn't miss anything run a more thorough check with:
 
 If all items are green, then congratulations upgrade complete!
 
-## 10. Update OmniAuth configuration
+## 11. Update OmniAuth configuration
 
 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/).
diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md
index f6af9d56860..d4b83a45e68 100644
--- a/doc/update/7.2-to-7.3.md
+++ b/doc/update/7.2-to-7.3.md
@@ -2,14 +2,71 @@
 
 # GitLab 7.3 has not been released yet!
 
-This document currently just serves as a place to keep track of updates that will be needed for the 7.3 update.
+### 0. Backup
 
-### Update config files
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
 
-* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab but with your settings.
-* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab-ssl but with your setting
+### 1. Stop server
 
-### Configure Redis to use sockets
+```bash
+sudo service gitlab stop
+```
+
+### 2. Get latest code
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git fetch --all
+```
+
+For GitLab Community Edition:
+
+```bash
+sudo -u git -H git checkout 7-3-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 7-3-stable-ee
+```
+
+### 3. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v2.0.0
+```
+
+### 4. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without ... postgres')
+sudo -u git -H bundle install --without development test postgres --deployment
+
+# PostgreSQL installations (note: the line below states '--without ... mysql')
+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
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+# Update init.d script
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+```
+
+
+### 5. Configure Redis to use sockets
 
     # Configure redis to use sockets
     sudo cp /etc/redis/redis.conf /etc/redis/redis.conf.orig
@@ -29,3 +86,58 @@ This document currently just serves as a place to keep track of updates that wil
     # Configure gitlab-shell to use Redis sockets
     sudo -u git -H sed -i 's|^  # socket.*|  socket: /var/run/redis/redis.sock|' config.yml
 
+### 6. Update config files
+
+#### New configuration options for gitlab.yml
+
+There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml.
+
+```
+git diff 7-2-stable:config/gitlab.yml.example 7-3-stable:config/gitlab.yml.example
+```
+
+* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/lib/support/nginx/gitlab-ssl but with your setting
+
+Update rack attack middleware config
+
+```
+sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
+```
+
+### 7. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 8. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check with:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations upgrade is complete!
+
+### 9. Update OmniAuth configuration
+
+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/).
+More details can be found at the [integration documentation](../integration/google.md).
+
+## Things went south? Revert to previous version (7.2)
+
+### 1. Revert the code to the previous version
+Follow the [upgrade guide from 7.1 to 7.2](7.1-to-7.2.md), except for the database migration
+(The backup is already migrated to the previous version)
+
+### 2. Restore from the backup:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.