Skip to content

Commit 2de7686

Browse files
committed
docker-compose: Improve documentation of configuration options.
Also mention LOADBALANCER_IPS in a comment, since we've had a number of folks tripped up by not discovering it. Fixes #449.
1 parent e9ed26c commit 2de7686

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ putting it in `/opt/docker/zulip/zulip/certs/` (by default, the
190190
`zulip` container startup script will generate a self-signed certificate and
191191
install it in that directory).
192192

193-
**Load balancer**. To tell Zulip that it is behind a load balancer,
194-
you must set `LOADBALANCER_IPS` to a comma-separated list of IPs or
195-
CIDR ranges. This will tell Zulip to pass the real IP of the client,
196-
instead of the IP of the load balancer itself, by [setting the
193+
**Reverse proxies**. To tell Zulip that it is behind a reverse proxy
194+
or load balancer, you must set `LOADBALANCER_IPS` to a comma-separated
195+
list of IPs or CIDR ranges. This will tell Zulip to pass the real IP
196+
of the client, instead of the IP of the proxy itself, by [setting the
197197
IPs][loadbalancer-ips] under `[loadbalancer]` in `zulip.conf`.
198198

199199
Your proxy must provide both `X-Forwarded-For` and

docker-compose.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ services:
6363
- "80:80"
6464
- "443:443"
6565
environment:
66+
# See https://github.com/zulip/docker-zulip#configuration for
67+
# details on this section and how to discover the many
68+
# additional settings that are supported here.
6669
DB_HOST: "database"
6770
DB_HOST_PORT: "5432"
6871
DB_USER: "zulip"
@@ -90,6 +93,10 @@ services:
9093
# Uncomment this when configuring the mobile push notifications service
9194
# SETTING_ZULIP_SERVICE_PUSH_NOTIFICATIONS: "True"
9295
# SETTING_ZULIP_SERVICE_SUBMIT_USAGE_STATISTICS: "True"
96+
97+
# If you're using a reverse proxy, you'll want to provide the
98+
# comma-separated set of IP addresses to trust here.
99+
# LOADBALANCER_IPS: "",
93100
volumes:
94101
- "zulip:/data:rw"
95102
ulimits:

0 commit comments

Comments
 (0)