Skip to content
Snippets Groups Projects
Commit 0b3bb99e5cd7 authored by Douglas Thor's avatar Douglas Thor
Browse files

Update nginx.md to address confusion in gitlab-ce#30619

parent d854c7373e56
No related branches found
No related tags found
No related merge requests found
......@@ -367,6 +367,24 @@
Run `gitlab-ctl reconfigure` to rewrite the NGINX configuration and restart
NGINX.
This inserts the defined string into the end of the `server` block of
`/var/opt/gitlab/nginx/conf/gitlab-http.conf`.
### Notes:
+ If you're adding a new location, you might need to include
```conf
proxy_cache off;
proxy_pass http://gitlab-workhorse;
```
in the string or in the included nginx config. Without these, any sub-location
will return a 404. See
[gitlab-ce#30619](https://gitlab.com/gitlab-org/gitlab-ce/issues/30619).
+ You cannot add the root `/` location or the `/assets` location as those already
exist in `gitlab-http.conf`.
## Inserting custom settings into the NGINX config
If you need to add custom settings into the NGINX config, for example to include
......@@ -380,6 +398,9 @@
Run `gitlab-ctl reconfigure` to rewrite the NGINX configuration and restart
NGINX.
This inserts the defined string into the end of the `http` block of
`/var/opt/gitlab/nginx/conf/nginx.conf`.
## Custom error pages
You can use `custom_error_pages` to modify text on the default GitLab error page.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment