Download as
Browse Code »

Commit b446c619e95032e126eb903c40ed605963e7b66f

Authored by Jacob Vosmaer
2 parents 497a2096 27a1517b
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'order-upgrade-guide' into 'master' 

Order Upgrade Guide
Showing 1 changed file with 40 additions and 30 deletions   Show diff stats
1 # Updating GitLab via omnibus-gitlab 1 # Updating GitLab via omnibus-gitlab
2 2
  3 +## Upgrading from a non-Omnibus installation to an Omnibus installation
  4 +
  5 +Please be advised that you lose your settings in files such as gitlab.yml, unicorn.rb and smtp_settings.rb.
  6 +You will have to [configure those settings in /etc/gitlab/gitlab.rb](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#configuration).
  7 +SMTP is not supported in omnibus-gitlab at this time.
  8 +
  9 +Do this by [creating a backup from the non-Omnibus install](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/raketasks/backup_restore.md#create-a-backup-of-the-gitlab-system) and [restoring this in the Omnibus installation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#restoring-an-application-backup).
  10 +Please ensure you are using exactly equal versions of GitLab (for example 6.7.3) when you do this.
  11 +You might have to upgrade your non-Omnibus installation before creating the backup to archive this.
  12 +
3 ## Updating from GitLab 6.6.x to 6.7.x 13 ## Updating from GitLab 6.6.x to 6.7.x
4 14
5 First, download the latest [CE](https://www.gitlab.com/downloads/) or 15 First, download the latest [CE](https://www.gitlab.com/downloads/) or
@@ -29,7 +39,36 @@ sudo gitlab-ctl start @@ -29,7 +39,36 @@ sudo gitlab-ctl start
29 39
30 Done! 40 Done!
31 41
32 -### Reverting to GitLab 6.6.x 42 +## Updating from GitLab 6.6.0.pre1 to 6.6.4
  43 +
  44 +First, download the latest package from https://www.gitlab.com/downloads/ to your GitLab server.
  45 +
  46 +```shell
  47 +# Stop unicorn and sidekiq so we can do database migrations
  48 +sudo gitlab-ctl stop unicorn
  49 +sudo gitlab-ctl stop sidekiq
  50 +
  51 +# One-time migration because we changed some directories since 6.6.0.pre1
  52 +sudo mkdir -p /var/opt/gitlab/git-data
  53 +sudo mv /var/opt/gitlab/{repositories,gitlab-satellites} /var/opt/gitlab/git-data/
  54 +sudo mv /var/opt/gitlab/uploads /var/opt/gitlab/gitlab-rails/
  55 +
  56 +# Install the latest package
  57 +# Ubuntu:
  58 +sudo dpkg -i gitlab_6.6.4-omnibus.xxx.deb
  59 +# CentOS:
  60 +sudo rpm -Uvh gitlab-6.6.4_xxx.rpm
  61 +
  62 +# Reconfigure GitLab (includes database migrations)
  63 +sudo gitlab-ctl reconfigure
  64 +
  65 +# Start unicorn and sidekiq
  66 +sudo gitlab-ctl start
  67 +```
  68 +
  69 +Done!
  70 +
  71 +## Reverting to GitLab 6.6.x
33 72
34 First download a GitLab 6.6.x [CE](https://www.gitlab.com/downloads/archives/) or 73 First download a GitLab 6.6.x [CE](https://www.gitlab.com/downloads/archives/) or
35 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md) 74 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md)
@@ -63,32 +102,3 @@ sudo gitlab-rake gitlab:backup:restore BACKUP=12345 # where 12345 is your backup @@ -63,32 +102,3 @@ sudo gitlab-rake gitlab:backup:restore BACKUP=12345 # where 12345 is your backup
63 # Start GitLab 102 # Start GitLab
64 sudo gitlab-ctl start 103 sudo gitlab-ctl start
65 ``` 104 ```
66 -  
67 -## Updating from GitLab 6.6.0.pre1 to 6.6.4  
68 -  
69 -First, download the latest package from https://www.gitlab.com/downloads/ to your GitLab server.  
70 -  
71 -```shell  
72 -# Stop unicorn and sidekiq so we can do database migrations  
73 -sudo gitlab-ctl stop unicorn  
74 -sudo gitlab-ctl stop sidekiq  
75 -  
76 -# One-time migration because we changed some directories since 6.6.0.pre1  
77 -sudo mkdir -p /var/opt/gitlab/git-data  
78 -sudo mv /var/opt/gitlab/{repositories,gitlab-satellites} /var/opt/gitlab/git-data/  
79 -sudo mv /var/opt/gitlab/uploads /var/opt/gitlab/gitlab-rails/  
80 -  
81 -# Install the latest package  
82 -# Ubuntu:  
83 -sudo dpkg -i gitlab_6.6.4-omnibus.xxx.deb  
84 -# CentOS:  
85 -sudo rpm -Uvh gitlab-6.6.4_xxx.rpm  
86 -  
87 -# Reconfigure GitLab (includes database migrations)  
88 -sudo gitlab-ctl reconfigure  
89 -  
90 -# Start unicorn and sidekiq  
91 -sudo gitlab-ctl start  
92 -```  
93 -  
94 -Done!