Download as
Browse Code »

Commit 52b4f434a97ce6040dfe6b944e289c1794a76188

Authored by Jacob Vosmaer
2 parents 0ef85785 49a7ef08
Exists in master and in 9 other branches 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 'improve-external-db-doc' into 'master' 

Improve external db doc
Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
@@ -450,11 +450,9 @@ sudo /opt/gitlab/bin/gitlab-rails console @@ -450,11 +450,9 @@ sudo /opt/gitlab/bin/gitlab-rails console
450 450
451 This will only work after you have run `gitlab-ctl reconfigure` at least once. 451 This will only work after you have run `gitlab-ctl reconfigure` at least once.
452 452
453 -## Using a non-packaged database management server 453 +## Using a MySQL database management server (Enterprise Edition only)
454 454
455 -If you do not want to use the built-in Postgres  
456 -server of omnibus-gitlab or if you want to use MySQL (GitLab Enterprise Edition  
457 -only) you can do so as follows. 455 +If you want to use MySQL and are using the **GitLab Enterprise Edition packages** please do the following:
458 456
459 Important note: if you are connecting omnibus-gitlab to an existing GitLab 457 Important note: if you are connecting omnibus-gitlab to an existing GitLab
460 database you should create a backup before attempting this procedure. 458 database you should create a backup before attempting this procedure.
@@ -482,10 +480,8 @@ gitlab_rails['db_username'] = 'git' @@ -482,10 +480,8 @@ gitlab_rails['db_username'] = 'git'
482 gitlab_rails['db_password'] = 'password' 480 gitlab_rails['db_password'] = 'password'
483 ``` 481 ```
484 482
485 -Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see  
486 -the upstream GitLab examples for [Postgres][database.yml.postgresql] and  
487 -[MySQL][database.yml.mysql]. We remind you that `/etc/gitlab/gitlab.rb` should  
488 -have file permissions `0600` because it contains plaintext passwords. 483 +Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see the upstream GitLab for a [MySQL configuration example][database.yml.mysql].
  484 +We remind you that `/etc/gitlab/gitlab.rb` should have file permissions `0600` because it contains plaintext passwords.
489 485
490 Run `sudo gitlab-ctl reconfigure` for the change to take effect. 486 Run `sudo gitlab-ctl reconfigure` for the change to take effect.
491 487
@@ -500,6 +496,12 @@ sudo gitlab-rake gitlab:setup @@ -500,6 +496,12 @@ sudo gitlab-rake gitlab:setup
500 496
501 This is a destructive command; do not run it on an existing database! 497 This is a destructive command; do not run it on an existing database!
502 498
  499 +## Using a non-packaged PostgreSQL database management server
  500 +
  501 +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).
  502 +Configuring a PostgreSQL server is possible both with GitLab Community Edition and Enterprise Edition packages.
  503 +Please see the upstream GitLab for a [PostgreSQL configuration example][database.yml.postgresql].
  504 +
503 ## Building your own package 505 ## Building your own package
504 506
505 See [the separate build documentation](doc/build.md). 507 See [the separate build documentation](doc/build.md).