Skip to content
Snippets Groups Projects
Commit eb390226 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen
Browse files

Merge pull request #8318 from bbodenmiller/patch-9

add editor command to update database.yml; cleanup
parents 0a9cab4e 8e6ff86d
Branches
Tags
No related merge requests found
Loading
@@ -68,14 +68,17 @@ git diff origin/7-3-stable:config/gitlab.yml.example origin/7-4-stable:config/gi
Loading
@@ -68,14 +68,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 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 * 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 #### 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 ### 5. Start application
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment