Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ proxies][other-proxy].
[haproxy-proxy]: https://zulip.readthedocs.io/en/latest/production/reverse-proxies.html#haproxy-configuration
[other-proxy]: https://zulip.readthedocs.io/en/latest/production/reverse-proxies.html#other-proxies

**Outgoing proxy**: Zulip uses [Smokescreen][smokescreen] to proxy all
outgoing HTTP connections and prevent SSRF attacks. If you have
private IPs (e.g., outgoing webhook hosts on private IPs), you can set
`PROXY_ALLOW_ADDRESSES` or `PROXY_ALLOW_RANGES` to comma-separated
lists of IP addresses or CIDR ranges.

[smokescreen]: https://zulip.readthedocs.io/en/latest/production/deployment.html#customizing-the-outgoing-http-proxy

### Manual configuration

The way the environment variables configuration process described in
Expand Down
9 changes: 9 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,15 @@ puppetConfiguration() {
crudini --set /etc/zulip/zulip.conf loadbalancer ips "${LOADBALANCER_IPS}"
fi

if [ -n "$PROXY_ALLOW_ADDRESSES" ]; then
echo "Setting outgoing proxy allowed private IPs"
crudini --set /etc/zulip/zulip.conf http_proxy allow_addresses "${PROXY_ALLOW_ADDRESSES}"
fi
if [ -n "$PROXY_ALLOW_RANGES" ]; then
echo "Setting outgoing proxy allowed private IP ranges"
crudini --set /etc/zulip/zulip.conf http_proxy allow_ranges "${PROXY_ALLOW_RANGES}"
fi

/home/zulip/deployments/current/scripts/zulip-puppet-apply -f
}
configureCerts() {
Expand Down