From e049390f42d9f0d502997668d6859522c4c8e038 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 16 Oct 2015 17:08:09 -0400 Subject: Re-add Nginx configuration to 8.0-to-8.1 update guide --- doc/update/8.0-to-8.1.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/update/8.0-to-8.1.md b/doc/update/8.0-to-8.1.md index 01d03e7936b..d8f56cac2ef 100644 --- a/doc/update/8.0-to-8.1.md +++ b/doc/update/8.0-to-8.1.md @@ -109,6 +109,27 @@ There are new configuration options available for [`gitlab.yml`](config/gitlab.y git diff origin/8-0-stable:config/gitlab.yml.example origin/8-1-stable:config/gitlab.yml.example ``` +#### Nginx configuration + +View changes between the previous recommended Nginx configuration and the +current one: + +```sh +# For HTTPS configurations +git diff origin/8-0-stable:lib/support/nginx/gitlab-ssl origin/8-1-stable:lib/support/nginx/gitlab-ssl + +# For HTTP configurations +git diff origin/8-0-stable:lib/support/nginx/gitlab origin/8-1-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-git-http-server 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-1-stable/lib/support/init.d/gitlab.default.example#L34 + ### 8. Start application sudo service gitlab start -- cgit v1.2.1