From 4fdbc92949eed7b70d7bddf86bb7c420492fa6ab Mon Sep 17 00:00:00 2001 From: dosire Date: Mon, 14 Apr 2014 15:52:36 +0200 Subject: [PATCH] Add warning about upgrading. Non-packaged is more accurate than remote (can be on the same machine). --- README.md | 6 +++--- doc/update.md | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6026e0b..2241cef 100644 --- a/README.md +++ b/README.md @@ -308,9 +308,9 @@ sudo /opt/gitlab/bin/gitlab-rails console This will only work after you have run `gitlab-ctl reconfigure` at least once. -## Using omnibus-gitlab with a remote database server +## Using a non-packaged database management server -This is an advanced topic. If you do not want to use the built-in Postgres +If you do not want to use the built-in Postgres server of omnibus-gitlab or if you want to use MySQL (GitLab Enterprise Edition only) you can do so as follows. @@ -323,7 +323,7 @@ First, set up your database server according to the [upstream GitLab instructions](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#5-database). If you want to keep using an existing GitLab database you can skip this step. -### Configure omnibus-gitlab to connect to your remote database server +### Configure omnibus-gitlab to connect to it Next, we add the following settings to `/etc/gitlab/gitlab.rb`. diff --git a/doc/update.md b/doc/update.md index 1bd3ae5..5af2734 100644 --- a/doc/update.md +++ b/doc/update.md @@ -2,11 +2,13 @@ ## Upgrading from a non-Omnibus installation to an Omnibus installation +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. + Please be advised that you lose your settings in files such as gitlab.yml, unicorn.rb and smtp_settings.rb. You will have to [configure those settings in /etc/gitlab/gitlab.rb](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#configuration). SMTP is not supported in omnibus-gitlab at this time. -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). +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). Please ensure you are using exactly equal versions of GitLab (for example 6.7.3) when you do this. You might have to upgrade your non-Omnibus installation before creating the backup to archive this. -- libgit2 0.21.2