diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-10-02 08:05:32 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-10-02 08:07:36 +0200 |
| commit | 485162ec608784dc1cbafe70b3ba3201b0f74098 (patch) | |
| tree | 37870eb33e019ab726a6df081033641d333272bb | |
| parent | 970d86b7c5d0be871d8ab8d7cbd51997fd62e28a (diff) | |
| download | gitlab-ce-485162ec608784dc1cbafe70b3ba3201b0f74098.tar.gz | |
Streamline MySQL setup in installation.md
| -rw-r--r-- | config/database.yml.mysql | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql index a3eff1a74f8..e7a9227e41e 100644 --- a/config/database.yml.mysql +++ b/config/database.yml.mysql @@ -7,7 +7,7 @@ production: reconnect: false database: gitlabhq_production pool: 10 - username: root + username: gitlab password: "secure password" # host: localhost # socket: /tmp/mysql.sock diff --git a/doc/install/installation.md b/doc/install/installation.md index 03ea5fbb28f..91bf7c265a5 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -224,7 +224,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. # Make sure to update username/password in config/database.yml. # You only need to adapt the production settings (first part). # If you followed the database guide then please do as follows: - # Change 'root' to 'gitlab' # Change 'secure password' with the value you have given to $password # You can keep the double quotes around the password sudo -u git -H editor config/database.yml |