From 53f0d6cc519e68fec80468d7d58a64171f93b8b4 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 9 Apr 2014 14:14:19 +0200 Subject: No need to edit database.yml for standard Postgres Postgres running on localhost should recognize the `git` system user used by GitLab so there is no need to set/change database passwords. --- doc/install/installation.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 43061ee8d27..8650b7d727f 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 non-standard 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 -- cgit v1.2.1 From ac01e445360c5930d436371fcad92df784c29422 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 9 Apr 2014 18:17:45 +0200 Subject: Be more specific about when to edit database.yml --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 8650b7d727f..9ef1f8cabd0 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -238,7 +238,7 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. # MySQL only: sudo -u git cp config/database.yml.mysql config/database.yml - # MySQL and non-standard PostgreSQL only: + # 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: -- cgit v1.2.1