diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-24 08:22:34 +0000 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-07-27 15:12:29 -0300 |
| commit | 923b26133b8d04e8c4da4183b8f0382eefcc8147 (patch) | |
| tree | dd0e50be32664e2cc29a3d6a04c6a2ec1d69f275 | |
| parent | d202211108c34298482e3ae591de0b303ff3c262 (diff) | |
| download | gitlab-ce-923b26133b8d04e8c4da4183b8f0382eefcc8147.tar.gz | |
Merge branch 'feature/add-docs-to-disable-listener' into 'master'
Add docs to disable proxy listener
See merge request gitlab-org/gitlab-ce!19734
| -rw-r--r-- | doc/administration/pages/index.md | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index 9b1297ca4ba..f341e86aa22 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -124,11 +124,6 @@ The Pages daemon doesn't listen to the outside world. ``` 1. [Reconfigure GitLab][reconfigure] -1. Restart gitlab-pages by running the following command: - - ```shell - sudo gitlab-ctl restart gitlab-pages - ``` Watch the [video tutorial][video-admin] for this configuration. @@ -161,11 +156,6 @@ outside world. respectively. 1. [Reconfigure GitLab][reconfigure] -1. Restart gitlab-pages by running the following command: - - ```shell - sudo gitlab-ctl restart gitlab-pages - ``` ## Advanced configuration @@ -203,11 +193,6 @@ world. Custom domains are supported, but no TLS. listens on. If you don't have IPv6, you can omit the IPv6 address. 1. [Reconfigure GitLab][reconfigure] -1. Restart gitlab-pages by running the following command: - - ```shell - sudo gitlab-ctl restart gitlab-pages - ``` ### Custom domains with TLS support @@ -241,11 +226,6 @@ world. Custom domains and TLS are supported. listens on. If you don't have IPv6, you can omit the IPv6 address. 1. [Reconfigure GitLab][reconfigure] -1. Restart gitlab-pages by running the following command: - - ```shell - sudo gitlab-ctl restart gitlab-pages - ``` ### Custom domain verification @@ -273,11 +253,29 @@ are stored. ``` 1. [Reconfigure GitLab][reconfigure] -1. Restart gitlab-pages by running the following command: + +## Configure listener for reverse proxy requests + +Follow the steps below to configure the proxy listener of GitLab Pages. [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2533) in +Omnibus GitLab 11.1. + +1. By default the listener is configured to listen for requests on `localhost:8090`. + + If you wish to disable it you must configure this in + `/etc/gitlab/gitlab.rb`: ```shell - sudo gitlab-ctl restart gitlab-pages - ``` + gitlab_pages['listen_proxy'] = nil + ``` + + If you wish to make it listen on a different port you must configure this also in + `/etc/gitlab/gitlab.rb`: + + ```shell + gitlab_pages['listen_proxy'] = "localhost:10080" + ``` + +1. [Reconfigure GitLab][reconfigure] ## Set maximum pages size |