diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-19 09:08:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-19 09:08:50 +0000 |
| commit | 84bf092539468790e3d8d66e451643e7e62a08f8 (patch) | |
| tree | 5496483a6efc749541ee8ee45eabf5fca72695fd | |
| parent | d321305c00f934db9becac1aa9726c3e9b400df5 (diff) | |
| parent | e327455dfad873289b5f0c1b28fc08acfdd6da22 (diff) | |
| download | gitlab-ce-7-14-stable.tar.gz | |
Merge branch '7-14-stable-nginx-default' into '7-14-stable'
7-14-stable
Fix the file path to a default Nginx file that needs to be deleted for the GitLab web gui to be browsed.
Changing it from:
`/etc/sites-enabled/default`
to
`/etc/nginx/sites-enabled/default`
## Are there points in the code the reviewer needs to double check?
If we are expecting older versions than Ubuntu 16.04 with Nginx 1.10.0 to be the most common use case for a 7.14 source install, then maybe Nginx used to create this file in the place where the README says and in that case we would leave it.
The tests are failing but it can't be because of this change
## Why was this MR needed?
When trying to install V7.14 from source on Ubuntu 16.04 with Nginx 1.10.0, the README says to delete a file that exists in a different place from where the README points to.
Closes #7
See merge request !6220
| -rw-r--r-- | doc/install/installation.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 4b01077884e..46637a290c4 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -370,7 +370,7 @@ Make sure to edit the config file to match your setup: # domain name of your host serving GitLab. # If using Ubuntu default nginx install: # either remove the default_server from the listen line - # or else rm -f /etc/sites-enabled/default + # or else rm -f /etc/nginx/sites-enabled/default sudo editor /etc/nginx/sites-available/gitlab **Note:** If you want to use HTTPS, replace the `gitlab` Nginx config with `gitlab-ssl`. See [Using HTTPS](#using-https) for HTTPS configuration details. |