diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2014-11-23 02:32:23 -0800 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2014-11-23 02:32:23 -0800 |
| commit | 8e6ff86d3814f017448eb4b82065f8fa7cb526e1 (patch) | |
| tree | 75e4bc26fdc8f6cbed9c2df96a0e52aba1447534 /doc/update/7.3-to-7.4.md | |
| parent | 75c3dc9efcc88b8cc9a3d1013fbb5358bb64b432 (diff) | |
| download | gitlab-ce-8e6ff86d3814f017448eb4b82065f8fa7cb526e1.tar.gz | |
add editor command to update database.yml; cleanup
Diffstat (limited to 'doc/update/7.3-to-7.4.md')
| -rw-r--r-- | doc/update/7.3-to-7.4.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/update/7.3-to-7.4.md b/doc/update/7.3-to-7.4.md index 3f471500c82..6dce5c3ba8d 100644 --- a/doc/update/7.3-to-7.4.md +++ b/doc/update/7.3-to-7.4.md @@ -70,14 +70,17 @@ git diff origin/7-3-stable:config/gitlab.yml.example origin/7-4-stable:config/gi sudo -u git -H editor config/unicorn.rb ``` -#### Change nginx https settings +#### Change Nginx HTTPS settings * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/lib/support/nginx/gitlab-ssl but with your setting #### MySQL Databases: Update database.yml config file -* Add `collation: utf8_general_ci` to config/database.yml as seen in [config/database.yml.mysql](config/database.yml.mysql) +* Add `collation: utf8_general_ci` to `config/database.yml` as seen in [config/database.yml.mysql](/config/database.yml.mysql) +``` +sudo -u git -H editor config/database.yml +``` ### 5. Start application |