aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLecygneNoir <victor.jlc@laposte.net>2018-10-22 19:11:01 +0200
committerChocobozzz <me@florianbigard.com>2018-10-22 19:11:01 +0200
commiteff7cdd7b7c3667ac17312d49104488aaf698ba2 (patch)
treea98487ef08e07fc473377fa093e04fc8997edb73
parent4293e362af90fd61f22d5b88d926165e970e53db (diff)
downloadPeerTube-eff7cdd7b7c3667ac17312d49104488aaf698ba2.tar.gz
PeerTube-eff7cdd7b7c3667ac17312d49104488aaf698ba2.tar.zst
PeerTube-eff7cdd7b7c3667ac17312d49104488aaf698ba2.zip
Configure docker image to accept trust_proxy as an env variable in json array (#1338)
-rw-r--r--support/docker/production/.env5
-rw-r--r--support/docker/production/config/custom-environment-variables.yaml4
2 files changed, 7 insertions, 2 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 8af161b2a..4a649d655 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -3,7 +3,10 @@ PEERTUBE_DB_PASSWORD=postgres_password
3PEERTUBE_WEBSERVER_HOSTNAME=domain.tld 3PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
4PEERTUBE_WEBSERVER_PORT=443 4PEERTUBE_WEBSERVER_PORT=443
5PEERTUBE_WEBSERVER_HTTPS=true 5PEERTUBE_WEBSERVER_HTTPS=true
6PEERTUBE_TRUST_PROXY=127.0.0.1 6# If you need more than one IP as trust_proxy
7# pass them as a comma separated array:
8PEERTUBE_TRUST_PROXY=["127.0.0.1"]
9#PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "192.168.1.0/24"]
7PEERTUBE_SMTP_USERNAME= 10PEERTUBE_SMTP_USERNAME=
8PEERTUBE_SMTP_PASSWORD= 11PEERTUBE_SMTP_PASSWORD=
9PEERTUBE_SMTP_HOSTNAME= 12PEERTUBE_SMTP_HOSTNAME=
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 1f7fbf849..cfc30632c 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -7,7 +7,9 @@ webserver:
7 __name: "PEERTUBE_WEBSERVER_HTTPS" 7 __name: "PEERTUBE_WEBSERVER_HTTPS"
8 __format: "json" 8 __format: "json"
9 9
10trust_proxy: "PEERTUBE_TRUST_PROXY" 10trust_proxy:
11 __name: "PEERTUBE_TRUST_PROXY"
12 __format: "json"
11 13
12database: 14database:
13 hostname: "PEERTUBE_DB_HOSTNAME" 15 hostname: "PEERTUBE_DB_HOSTNAME"