diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-30 16:17:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-30 16:17:37 +0000 |
| commit | 2b9b20bc9613c4db20ebdd0b22c10a0dfe05678b (patch) | |
| tree | e8c37767cf57ccd2301641b458a09bc45ad37708 | |
| parent | ecdee8772b76c975f060f8a1143feb08fde34f93 (diff) | |
| parent | 3591afeef0da33429b9fd08bbf066120f1653af3 (diff) | |
| download | gitlab-ce-2b9b20bc9613c4db20ebdd0b22c10a0dfe05678b.tar.gz | |
Merge branch 'apache-gghs-tcp' into 'master'
Apache needs gitlab-git-http-server on TCP
[ci skip]
See merge request !1462
| -rw-r--r-- | doc/update/7.14-to-8.0.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md index 86c0825dff9..552216be932 100644 --- a/doc/update/7.14-to-8.0.md +++ b/doc/update/7.14-to-8.0.md @@ -168,6 +168,7 @@ git diff origin/7-14-stable:lib/support/nginx/gitlab origin/8-0-stable:lib/suppo ``` If you are using Apache instead of NGINX please see the updated [Apache templates](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache). +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](https://gitlab.com/gitlab-org/gitlab-ce/blob/8-0-stable/lib/support/init.d/gitlab.default.example#L34). ### 9. Migrate GitLab CI to GitLab CE/EE |