From 138e2a50b7d839bd37c21b2849df422f9dfef6bb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Feb 2014 15:16:33 +0200 Subject: [PATCH] PostgreSQL is first one now Signed-off-by: Dmitriy Zaporozhets --- doc/install/installation.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 44d57b97efb..3145f64b9e6 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -234,8 +234,8 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. ## Configure GitLab DB settings - # Mysql - sudo -u git cp config/database.yml.mysql config/database.yml + # PostgreSQL + sudo -u git cp config/database.yml.postgresql config/database.yml # Make sure to update username/password in config/database.yml. # You only need to adapt the production settings (first part). @@ -245,10 +245,8 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. sudo -u git -H editor config/database.yml or - - # PostgreSQL - sudo -u git cp config/database.yml.postgresql config/database.yml - + # Mysql + sudo -u git cp config/database.yml.mysql config/database.yml # Make config/database.yml readable to git only sudo -u git -H chmod o-rwx config/database.yml @@ -257,12 +255,12 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. cd /home/git/gitlab - # For MySQL (note, the option says "without ... postgres") - sudo -u git -H bundle install --deployment --without development test postgres aws - - # Or for PostgreSQL (note, the option says "without ... mysql") + # For PostgreSQL (note, the option says "without ... mysql") sudo -u git -H bundle install --deployment --without development test mysql aws + # Or if you use MySQL (note, the option says "without ... postgres") + sudo -u git -H bundle install --deployment --without development test postgres aws + ## Initialize Database and Activate Advanced Features