Commit ed35ea703cc4430c4c30f58d1183607ccc625bf8
1 parent
a7b572d0
Exists in
master
and in
4 other branches
Fix order of db setup in installation docs
Showing
2 changed files
with
16 additions
and
12 deletions
Show diff stats
doc/install/databases.md
| @@ -55,14 +55,3 @@ GitLab supports the following databases: | @@ -55,14 +55,3 @@ GitLab supports the following databases: | ||
| 55 | # Try connecting to the new database with the new user | 55 | # Try connecting to the new database with the new user |
| 56 | sudo -u gitlab -H psql -d gitlabhq_production | 56 | sudo -u gitlab -H psql -d gitlabhq_production |
| 57 | 57 | ||
| 58 | - | ||
| 59 | - | ||
| 60 | -# Configure GitLab | ||
| 61 | - | ||
| 62 | - # Mysql | ||
| 63 | - sudo -u gitlab cp config/database.yml.mysql config/database.yml | ||
| 64 | - | ||
| 65 | - # PostgreSQL | ||
| 66 | - sudo -u gitlab cp config/database.yml.postgresql config/database.yml | ||
| 67 | - | ||
| 68 | -Make sure to update username/password in config/database.yml. |
doc/install/installation.md
| @@ -199,12 +199,27 @@ do so with caution! | @@ -199,12 +199,27 @@ do so with caution! | ||
| 199 | **Important Note:** | 199 | **Important Note:** |
| 200 | Make sure to edit both files to match your setup. | 200 | Make sure to edit both files to match your setup. |
| 201 | 201 | ||
| 202 | +## Configure GitLab DB settings | ||
| 203 | + | ||
| 204 | + # Mysql | ||
| 205 | + sudo -u gitlab cp config/database.yml.mysql config/database.yml | ||
| 206 | + | ||
| 207 | + # PostgreSQL | ||
| 208 | + sudo -u gitlab cp config/database.yml.postgresql config/database.yml | ||
| 209 | + | ||
| 210 | +Make sure to update username/password in config/database.yml. | ||
| 211 | + | ||
| 202 | ## Install Gems | 212 | ## Install Gems |
| 203 | 213 | ||
| 204 | cd /home/gitlab/gitlab | 214 | cd /home/gitlab/gitlab |
| 205 | 215 | ||
| 206 | sudo gem install charlock_holmes --version '0.6.9' | 216 | sudo gem install charlock_holmes --version '0.6.9' |
| 207 | - sudo -u gitlab -H bundle install --deployment --without development test | 217 | + |
| 218 | + # For mysql db | ||
| 219 | + sudo -u gitlab -H bundle install --deployment --without development test postgres | ||
| 220 | + | ||
| 221 | + # Or For postgres db | ||
| 222 | + sudo -u gitlab -H bundle install --deployment --without development test mysql | ||
| 208 | 223 | ||
| 209 | ## Configure Git | 224 | ## Configure Git |
| 210 | 225 |