Commit 53f0d6cc519e68fec80468d7d58a64171f93b8b4
1 parent
e099d662
Exists in
spb-stable
and in
3 other branches
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.
Showing
1 changed file
with
7 additions
and
6 deletions
Show diff stats
doc/install/installation.md
... | ... | @@ -232,20 +232,21 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. |
232 | 232 | |
233 | 233 | ## Configure GitLab DB settings |
234 | 234 | |
235 | - # PostgreSQL | |
235 | + # PostgreSQL only: | |
236 | 236 | sudo -u git cp config/database.yml.postgresql config/database.yml |
237 | 237 | |
238 | - # Make sure to update username/password in config/database.yml. | |
238 | + # MySQL only: | |
239 | + sudo -u git cp config/database.yml.mysql config/database.yml | |
240 | + | |
241 | + # MySQL and non-standard PostgreSQL only: | |
242 | + # Update username/password in config/database.yml. | |
239 | 243 | # You only need to adapt the production settings (first part). |
240 | 244 | # If you followed the database guide then please do as follows: |
241 | 245 | # Change 'secure password' with the value you have given to $password |
242 | 246 | # You can keep the double quotes around the password |
243 | 247 | sudo -u git -H editor config/database.yml |
244 | 248 | |
245 | - or | |
246 | - # Mysql | |
247 | - sudo -u git cp config/database.yml.mysql config/database.yml | |
248 | - | |
249 | + # PostgreSQL and MySQL: | |
249 | 250 | # Make config/database.yml readable to git only |
250 | 251 | sudo -u git -H chmod o-rwx config/database.yml |
251 | 252 | ... | ... |