diff options
Diffstat (limited to 'doc/update/8.3-to-8.4.md')
| -rw-r--r-- | doc/update/8.3-to-8.4.md | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/doc/update/8.3-to-8.4.md b/doc/update/8.3-to-8.4.md index 616b1f58b65..269deec7a9c 100644 --- a/doc/update/8.3-to-8.4.md +++ b/doc/update/8.3-to-8.4.md @@ -81,27 +81,6 @@ There are new configuration options available for [`gitlab.yml`](config/gitlab.y git diff origin/8-3-stable:config/gitlab.yml.example origin/8-4-stable:config/gitlab.yml.example ``` -#### Nginx configuration - -GitLab 8.3 introduced major changes in the NGINX configuration. Ensure you're -still up-to-date with the latest changes: - -```sh -# For HTTPS configurations -git diff origin/8-3-stable:lib/support/nginx/gitlab-ssl origin/8-4-stable:lib/support/nginx/gitlab-ssl - -# For HTTP configurations -git diff origin/8-3-stable:lib/support/nginx/gitlab origin/8-4-stable:lib/support/nginx/gitlab -``` - -If you are using Apache instead of NGINX please see the updated [Apache templates]. -Also note that because Apache does not support upstreams behind Unix sockets you -will need to let gitlab-workhorse listen on a TCP port. You can do this -via [/etc/default/gitlab]. - -[Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache -[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-4-stable/lib/support/init.d/gitlab.default.example#L34 - #### Init script We updated the init script for GitLab in order to set a specific PATH for gitlab-workhorse. |