From: LecygneNoir <victor.jlc@laposte.net>
Date: Mon, 22 Oct 2018 17:11:01 +0000 (+0200)
Subject: Configure docker image to accept trust_proxy as an env variable in json array (#1338)
X-Git-Tag: v1.1.0-rc.1~73
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eff7cdd7b7c3667ac17312d49104488aaf698ba2;p=oweals%2Fpeertube.git

Configure docker image to accept trust_proxy as an env variable in json array (#1338)
---

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
 PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
-PEERTUBE_TRUST_PROXY=127.0.0.1
+# If you need more than one IP as trust_proxy
+# pass them as a comma separated array:
+PEERTUBE_TRUST_PROXY=["127.0.0.1"]
+#PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "192.168.1.0/24"]
 PEERTUBE_SMTP_USERNAME=
 PEERTUBE_SMTP_PASSWORD=
 PEERTUBE_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:
     __name: "PEERTUBE_WEBSERVER_HTTPS"
     __format: "json"
 
-trust_proxy: "PEERTUBE_TRUST_PROXY"
+trust_proxy:
+  __name: "PEERTUBE_TRUST_PROXY"
+  __format: "json"
 
 database:
   hostname: "PEERTUBE_DB_HOSTNAME"