Download as
Browse Code »

Commit 1fc659913d2ff4dfa1c7085b763671437b742cfe

Authored by Jacob Vosmaer
2 parents 5ca12a81 c247cc98
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 'upgrade-warning' into 'master' 

Upgrade Warning
Showing 2 changed files with 8 additions and 4 deletions   Show diff stats
README.md
  Diff comments   View file @1fc6599
... ... @@ -310,9 +310,9 @@ sudo /opt/gitlab/bin/gitlab-rails console
310 310  
311 311 This will only work after you have run `gitlab-ctl reconfigure` at least once.
312 312  
313   -## Using omnibus-gitlab with a remote database server
  313 +## Using a non-packaged database management server
314 314  
315   -This is an advanced topic. If you do not want to use the built-in Postgres
  315 +If you do not want to use the built-in Postgres
316 316 server of omnibus-gitlab or if you want to use MySQL (GitLab Enterprise Edition
317 317 only) you can do so as follows.
318 318  
... ... @@ -325,7 +325,7 @@ First, set up your database server according to the [upstream GitLab
325 325 instructions](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#5-database).
326 326 If you want to keep using an existing GitLab database you can skip this step.
327 327  
328   -### Configure omnibus-gitlab to connect to your remote database server
  328 +### Configure omnibus-gitlab to connect to it
329 329  
330 330 Next, we add the following settings to `/etc/gitlab/gitlab.rb`.
331 331  
... ...
doc/update.md
  Diff comments   View file @1fc6599
... ... @@ -2,11 +2,15 @@
2 2  
3 3 ## Upgrading from a non-Omnibus installation to an Omnibus installation
4 4  
  5 +Upgrading from non-Omnibus installations has not been tested by GitLab.com.
  6 +
  7 +If you are using a MySQL database you have to configure a [non-packaged MySQL database](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#using-a-non-packaged-database-management-server) or [convert to PostgreSQL](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/mysql_to_postgresql.md) before the backup.
  8 +
5 9 Please be advised that you lose your settings in files such as gitlab.yml, unicorn.rb and smtp_settings.rb.
6 10 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 11 SMTP is not supported in omnibus-gitlab at this time.
8 12  
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).
  13 +Upgrade 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 14 Please ensure you are using exactly equal versions of GitLab (for example 6.7.3) when you do this.
11 15 You might have to upgrade your non-Omnibus installation before creating the backup to archive this.
12 16  
... ...