Download as
Browse Code »

Commit 4fdbc92949eed7b70d7bddf86bb7c420492fa6ab

Authored by dosire
1 parent b446c619
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

Add warning about upgrading. Non-packaged is more accurate than remote (can be on the same machine).

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