aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorvictor héry <git@lecygnenoir.info>2018-09-16 17:53:57 +0200
committerRigel Kent <par@rigelk.eu>2018-09-16 18:50:13 +0200
commitff587059b9d901c26eab34f4b7f0c06130aae10d (patch)
tree259a802f285787ce2d7d1a8b6479133da81ed9c7
parenta2377d15ee09301cf4cc5434ad865a21918da15f (diff)
downloadPeerTube-ff587059b9d901c26eab34f4b7f0c06130aae10d.tar.gz
PeerTube-ff587059b9d901c26eab34f4b7f0c06130aae10d.tar.zst
PeerTube-ff587059b9d901c26eab34f4b7f0c06130aae10d.zip
Add possibility to manage trust_proxy list in docker image
-rw-r--r--support/docker/production/.env1
-rw-r--r--support/docker/production/config/custom-environment-variables.yaml2
2 files changed, 3 insertions, 0 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 51c4e0ace..8af161b2a 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -3,6 +3,7 @@ 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
6PEERTUBE_SMTP_USERNAME= 7PEERTUBE_SMTP_USERNAME=
7PEERTUBE_SMTP_PASSWORD= 8PEERTUBE_SMTP_PASSWORD=
8PEERTUBE_SMTP_HOSTNAME= 9PEERTUBE_SMTP_HOSTNAME=
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 1c732e2e0..daf885813 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -7,6 +7,8 @@ webserver:
7 __name: "PEERTUBE_WEBSERVER_HTTPS" 7 __name: "PEERTUBE_WEBSERVER_HTTPS"
8 __format: "json" 8 __format: "json"
9 9
10trust_proxy: "PEERTUBE_TRUST_PROXY"
11
10database: 12database:
11 hostname: "PEERTUBE_DB_HOSTNAME" 13 hostname: "PEERTUBE_DB_HOSTNAME"
12 port: 14 port: