diff options
author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-04-14 09:55:59 +0000 |
---|---|---|
committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-04-14 09:55:59 +0000 |
commit | ec5bfec24e798199d1c53f6ff74fb632e0d244e1 (patch) | |
tree | 48d32a613079ff208fc290b1b9d035168a67c23c | |
parent | f2b2f2c2dc1b2cf02bf9d2b8751bf04060391352 (diff) | |
parent | ac01e445360c5930d436371fcad92df784c29422 (diff) | |
download | gitlab-ce-ec5bfec24e798199d1c53f6ff74fb632e0d244e1.tar.gz |
Merge branch 'postgres_installation' into 'master'
No need to edit database.yml for standard Postgres
-rw-r--r-- | doc/install/installation.md | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 0c99ef81815..1c7a02cecec 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -232,20 +232,21 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. ## Configure GitLab DB settings - # PostgreSQL + # PostgreSQL only: sudo -u git cp config/database.yml.postgresql config/database.yml - # Make sure to update username/password in config/database.yml. + # MySQL only: + sudo -u git cp config/database.yml.mysql config/database.yml + + # MySQL and remote PostgreSQL only: + # Update username/password in config/database.yml. # You only need to adapt the production settings (first part). # If you followed the database guide then please do as follows: # Change 'secure password' with the value you have given to $password # You can keep the double quotes around the password sudo -u git -H editor config/database.yml - or - # Mysql - sudo -u git cp config/database.yml.mysql config/database.yml - + # PostgreSQL and MySQL: # Make config/database.yml readable to git only sudo -u git -H chmod o-rwx config/database.yml |