diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-13 09:53:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-13 09:53:13 +0000 |
| commit | e83424a13e1b5d2e55ae5bd0aeae6a4c5f88262a (patch) | |
| tree | fbd59aea542ed6661f5261a49a862b07132f7b00 /doc | |
| parent | 5d14615a762d63ba3e04fa5ebbbbd990bdbd7572 (diff) | |
| parent | e18f20d7118b7c8f2ff18a6e4255d6c7c0995b04 (diff) | |
| download | gitlab-ce-e83424a13e1b5d2e55ae5bd0aeae6a4c5f88262a.tar.gz | |
Merge branch 'configure_trusted_proxies' into 'master'
Adjust the default trusted_proxies to only include localhost
And also allow other trusted proxies to be added from the config.yml.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538
Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208
See merge request !3524
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install/installation.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index f8f7d6a9ebe..e721e70a596 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -530,6 +530,16 @@ See the [omniauth integration document](../integration/omniauth.md) GitLab can build your projects. To enable that feature you need GitLab Runners to do that for you. Checkout the [GitLab Runner section](https://about.gitlab.com/gitlab-ci/#gitlab-runner) to install it +### Adding your Trusted Proxies + +If you are using a reverse proxy on an separate machine, you may want to add the +proxy to the trusted proxies list. Otherwise users will appear signed in from the +proxy's IP address. + +You can add trusted proxies in `config/gitlab.yml` by customizing the `trusted_proxies` +option in section 1. Save the file and [reconfigure GitLab](../administration/restart_gitlab.md) +for the changes to take effect. + ### Custom Redis Connection If you'd like Resque to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the `config/resque.yml` file. |