From b4e68c7b19de0509f185b3b3eed327ca1098662d Mon Sep 17 00:00:00 2001 From: GitLab Date: Fri, 30 May 2014 14:54:16 +0200 Subject: [PATCH] Split database configuration to make EE only aspect more obvious based on customer feedback. --- README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 11292c6..86e6a93 100644 --- a/README.md +++ b/README.md @@ -368,11 +368,9 @@ sudo /opt/gitlab/bin/gitlab-rails console This will only work after you have run `gitlab-ctl reconfigure` at least once. -## Using a non-packaged database management server +## Using a MySQL database management server (Enterprise Edition only) -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. +If you want to use MySQL and are using the **GitLab Enterprise Edition packages** please do the following: Important note: if you are connecting omnibus-gitlab to an existing GitLab database you should create a backup before attempting this procedure. @@ -400,13 +398,17 @@ gitlab_rails['db_username'] = 'git' gitlab_rails['db_password'] = 'password' ``` -Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see -the upstream GitLab examples for [Postgres][database.yml.postgresql] and -[MySQL][database.yml.mysql]. We remind you that `/etc/gitlab/gitlab.rb` should -have file permissions `0600` because it contains plaintext passwords. +Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see the upstream GitLab for a [MySQL configuration example][database.yml.mysql]. +We remind you that `/etc/gitlab/gitlab.rb` should have file permissions `0600` because it contains plaintext passwords. Run `sudo gitlab-ctl reconfigure` for the change to take effect. +## Using a non-packaged PostgreSQL database management server + +If you do do not want to use the packaged Postgres server you can configure an external one similar to configuring a MySQL server (shown above). +Configuring a PostgreSQL server is possible both with GitLab Community Edition and Enterprise Edition packages. +Please see the upstream GitLab for a [PostgreSQL configuration example][database.yml.postgresql]. + ### Seed the database (fresh installs only) Omnibus-gitlab will not automatically seed your external database. Run the -- libgit2 0.21.2