summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-22 12:01:54 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-22 12:01:54 +0200
commited35ea703cc4430c4c30f58d1183607ccc625bf8 (patch)
tree32a9fcf289552d9499369f9eff246105a78e4d53
parenta7b572d0ab4861110100b54abcc863a312dcefaa (diff)
downloadgitlab-ce-ed35ea703cc4430c4c30f58d1183607ccc625bf8.tar.gz
Fix order of db setup in installation docs
-rw-r--r--doc/install/databases.md11
-rw-r--r--doc/install/installation.md17
2 files changed, 16 insertions, 12 deletions
diff --git a/doc/install/databases.md b/doc/install/databases.md
index 92011647f11..6799a46eb63 100644
--- a/doc/install/databases.md
+++ b/doc/install/databases.md
@@ -55,14 +55,3 @@ GitLab supports the following databases:
# Try connecting to the new database with the new user
sudo -u gitlab -H psql -d gitlabhq_production
-
-
-# Configure GitLab
-
- # Mysql
- sudo -u gitlab cp config/database.yml.mysql config/database.yml
-
- # PostgreSQL
- sudo -u gitlab cp config/database.yml.postgresql config/database.yml
-
-Make sure to update username/password in config/database.yml.
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 159713dcba9..ef42770e019 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -199,12 +199,27 @@ do so with caution!
**Important Note:**
Make sure to edit both files to match your setup.
+## Configure GitLab DB settings
+
+ # Mysql
+ sudo -u gitlab cp config/database.yml.mysql config/database.yml
+
+ # PostgreSQL
+ sudo -u gitlab cp config/database.yml.postgresql config/database.yml
+
+Make sure to update username/password in config/database.yml.
+
## Install Gems
cd /home/gitlab/gitlab
sudo gem install charlock_holmes --version '0.6.9'
- sudo -u gitlab -H bundle install --deployment --without development test
+
+ # For mysql db
+ sudo -u gitlab -H bundle install --deployment --without development test postgres
+
+ # Or For postgres db
+ sudo -u gitlab -H bundle install --deployment --without development test mysql
## Configure Git