Commit 485162ec608784dc1cbafe70b3ba3201b0f74098
1 parent
970d86b7
Exists in
master
and in
4 other branches
Streamline MySQL setup in installation.md
Showing
2 changed files
with
1 additions
and
2 deletions
Show diff stats
config/database.yml.mysql
| @@ -7,7 +7,7 @@ production: | @@ -7,7 +7,7 @@ production: | ||
| 7 | reconnect: false | 7 | reconnect: false |
| 8 | database: gitlabhq_production | 8 | database: gitlabhq_production |
| 9 | pool: 10 | 9 | pool: 10 |
| 10 | - username: root | 10 | + username: gitlab |
| 11 | password: "secure password" | 11 | password: "secure password" |
| 12 | # host: localhost | 12 | # host: localhost |
| 13 | # socket: /tmp/mysql.sock | 13 | # socket: /tmp/mysql.sock |
doc/install/installation.md
| @@ -224,7 +224,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. | @@ -224,7 +224,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. | ||
| 224 | # Make sure to update username/password in config/database.yml. | 224 | # Make sure to update username/password in config/database.yml. |
| 225 | # You only need to adapt the production settings (first part). | 225 | # You only need to adapt the production settings (first part). |
| 226 | # If you followed the database guide then please do as follows: | 226 | # If you followed the database guide then please do as follows: |
| 227 | - # Change 'root' to 'gitlab' | ||
| 228 | # Change 'secure password' with the value you have given to $password | 227 | # Change 'secure password' with the value you have given to $password |
| 229 | # You can keep the double quotes around the password | 228 | # You can keep the double quotes around the password |
| 230 | sudo -u git -H editor config/database.yml | 229 | sudo -u git -H editor config/database.yml |