diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /support/docker | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'support/docker')
| -rw-r--r-- | support/docker/production/.env | 1 | ||||
| -rw-r--r-- | support/docker/production/config/custom-environment-variables.yaml | 2 |
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 | |||
| 3 | PEERTUBE_WEBSERVER_HOSTNAME=domain.tld | 3 | PEERTUBE_WEBSERVER_HOSTNAME=domain.tld |
| 4 | PEERTUBE_WEBSERVER_PORT=443 | 4 | PEERTUBE_WEBSERVER_PORT=443 |
| 5 | PEERTUBE_WEBSERVER_HTTPS=true | 5 | PEERTUBE_WEBSERVER_HTTPS=true |
| 6 | PEERTUBE_TRUST_PROXY=127.0.0.1 | ||
| 6 | PEERTUBE_SMTP_USERNAME= | 7 | PEERTUBE_SMTP_USERNAME= |
| 7 | PEERTUBE_SMTP_PASSWORD= | 8 | PEERTUBE_SMTP_PASSWORD= |
| 8 | PEERTUBE_SMTP_HOSTNAME= | 9 | PEERTUBE_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 | ||
| 10 | trust_proxy: "PEERTUBE_TRUST_PROXY" | ||
| 11 | |||
| 10 | database: | 12 | database: |
| 11 | hostname: "PEERTUBE_DB_HOSTNAME" | 13 | hostname: "PEERTUBE_DB_HOSTNAME" |
| 12 | port: | 14 | port: |