Download as
Browse Code »

Commit 1b93ecfb50e1efabfa86c8ea9cc40623c8197bfc

Authored by Jacob Vosmaer
2 parents f40eef4a 9a259b4c
Exists in 6-9-stable-ee

Merge branch '6-9-stable' into 6-9-stable-ee

Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
@@ -368,11 +368,9 @@ sudo /opt/gitlab/bin/gitlab-rails console @@ -368,11 +368,9 @@ sudo /opt/gitlab/bin/gitlab-rails console
368 368
369 This will only work after you have run `gitlab-ctl reconfigure` at least once. 369 This will only work after you have run `gitlab-ctl reconfigure` at least once.
370 370
371 -## Using a non-packaged database management server 371 +## Using a MySQL database management server (Enterprise Edition only)
372 372
373 -If you do not want to use the built-in Postgres  
374 -server of omnibus-gitlab or if you want to use MySQL (GitLab Enterprise Edition  
375 -only) you can do so as follows. 373 +If you want to use MySQL and are using the **GitLab Enterprise Edition packages** please do the following:
376 374
377 Important note: if you are connecting omnibus-gitlab to an existing GitLab 375 Important note: if you are connecting omnibus-gitlab to an existing GitLab
378 database you should create a backup before attempting this procedure. 376 database you should create a backup before attempting this procedure.
@@ -400,10 +398,8 @@ gitlab_rails['db_username'] = 'git' @@ -400,10 +398,8 @@ gitlab_rails['db_username'] = 'git'
400 gitlab_rails['db_password'] = 'password' 398 gitlab_rails['db_password'] = 'password'
401 ``` 399 ```
402 400
403 -Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see  
404 -the upstream GitLab examples for [Postgres][database.yml.postgresql] and  
405 -[MySQL][database.yml.mysql]. We remind you that `/etc/gitlab/gitlab.rb` should  
406 -have file permissions `0600` because it contains plaintext passwords. 401 +Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see the upstream GitLab for a [MySQL configuration example][database.yml.mysql].
  402 +We remind you that `/etc/gitlab/gitlab.rb` should have file permissions `0600` because it contains plaintext passwords.
407 403
408 Run `sudo gitlab-ctl reconfigure` for the change to take effect. 404 Run `sudo gitlab-ctl reconfigure` for the change to take effect.
409 405
@@ -418,6 +414,12 @@ sudo gitlab-rake gitlab:setup @@ -418,6 +414,12 @@ sudo gitlab-rake gitlab:setup
418 414
419 This is a destructive command; do not run it on an existing database! 415 This is a destructive command; do not run it on an existing database!
420 416
  417 +## Using a non-packaged PostgreSQL database management server
  418 +
  419 +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).
  420 +Configuring a PostgreSQL server is possible both with GitLab Community Edition and Enterprise Edition packages.
  421 +Please see the upstream GitLab for a [PostgreSQL configuration example][database.yml.postgresql].
  422 +
421 ## Building your own package 423 ## Building your own package
422 424
423 See [the separate build documentation](doc/build.md). 425 See [the separate build documentation](doc/build.md).