Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2016-04-06 16:49:46 +0300
committerDJ Mountney <david@twkie.net>2016-04-12 20:42:59 +0300
commitbb372ac97f733c45f22dc31e09b98a78411d4f86 (patch)
tree2e29572f5da4cf6c51c4e85a7b266e6df7791435 /config
parent38cff18af0ed48bcd5916b6b6bb6ceeb9ab062fd (diff)
Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example9
1 files changed, 9 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 35c7c425a5a..56caee47c97 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -46,6 +46,15 @@ production: &base
#
# relative_url_root: /gitlab
+ # Trusted Proxies
+ # Customize if you have GitLab behind a reverse proxy which is running on a different machine.
+ # Add the IP address for your reverse proxy to the list, otherwise users will appear signed in from that address.
+ trusted_proxies:
+ # Examples:
+ #- 192.168.1.0/24
+ #- 192.168.2.1
+ #- 2001:0db8::/32
+
# Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
# user: git