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 8af161b2af96aee840910dcedefb6368b1224206..4a649d65597989dd6617f6865e103f704cf49bbe 100644 (file)
--- 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 1f7fbf849e36ed62d1097ea4064102635399e637..cfc30632cbc2020abeef37239123aa77790ba90a 100644 (file)
--- 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"