diff options
| author | DJ Mountney <david@twkie.net> | 2016-04-06 06:49:46 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2016-04-12 10:42:59 -0700 |
| commit | bb372ac97f733c45f22dc31e09b98a78411d4f86 (patch) | |
| tree | 2e29572f5da4cf6c51c4e85a7b266e6df7791435 /doc/install | |
| parent | 38cff18af0ed48bcd5916b6b6bb6ceeb9ab062fd (diff) | |
| download | gitlab-ce-bb372ac97f733c45f22dc31e09b98a78411d4f86.tar.gz | |
Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting
Diffstat (limited to 'doc/install')
| -rw-r--r-- | doc/install/installation.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index f8f7d6a9ebe..bfea4ce193e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -530,6 +530,15 @@ 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. Please restart GitLab after editing this file. + ### 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. |