aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKim <1877318+kimsible@users.noreply.github.com>2020-05-18 17:50:58 +0200
committerGitHub <noreply@github.com>2020-05-18 17:50:58 +0200
commit148ab2f0f043a4c7cc28f9497cb6ae3819e8b838 (patch)
treea42494e2843d06a3dc18bfd76d5a41565014ab89
parent51539e95d954867d5c4561ac56843105253db79c (diff)
downloadPeerTube-148ab2f0f043a4c7cc28f9497cb6ae3819e8b838.tar.gz
PeerTube-148ab2f0f043a4c7cc28f9497cb6ae3819e8b838.tar.zst
PeerTube-148ab2f0f043a4c7cc28f9497cb6ae3819e8b838.zip
Fixes docker-compose .env (#2538)
* chore: remove unused var * fix database name as peertube + update comments * chore: comment vars indentic to production.yrml * add smtp comment * clarify and detail comments Co-authored-by: kimsible <kimsible@users.noreply.github.com>
-rw-r--r--support/doc/docker.md1
-rw-r--r--support/docker/production/.env26
2 files changed, 22 insertions, 5 deletions
diff --git a/support/doc/docker.md b/support/doc/docker.md
index c599af0f9..c1173972a 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -84,7 +84,6 @@ vim ./.env
84In the downloaded example [.env](https://github.com/Chocobozzz/PeerTube/blob/master/support/docker/production/.env), you must replace: 84In the downloaded example [.env](https://github.com/Chocobozzz/PeerTube/blob/master/support/docker/production/.env), you must replace:
85- `<MY POSTGRES USERNAME>` 85- `<MY POSTGRES USERNAME>`
86- `<MY POSTGRES PASSWORD>` 86- `<MY POSTGRES PASSWORD>`
87- `<MY POSTGRES DB>`
88- `<MY DOMAIN>` without 'https://' 87- `<MY DOMAIN>` without 'https://'
89- `<MY EMAIL ADDRESS>` 88- `<MY EMAIL ADDRESS>`
90 89
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 4743b68db..8ed9b062b 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -1,32 +1,50 @@
1# Database / Postgres service configuration
1POSTGRES_USER=<MY POSTGRES USERNAME> 2POSTGRES_USER=<MY POSTGRES USERNAME>
2POSTGRES_PASSWORD=<MY POSTGRES PASSWORD> 3POSTGRES_PASSWORD=<MY POSTGRES PASSWORD>
3POSTGRES_DB=<MY POSTGRES DB> 4# Postgres database name "peertube"
5POSTGRES_DB=peertube
6# Editable only with a suffix :
7#POSTGRES_DB=peertube_prod
8#PEERTUBE_DB_SUFFIX=_prod
4PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> 9PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME>
5PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> 10PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD>
6# PEERTUBE_DB_HOSTNAME is the Postgres service name in docker-compose.yml 11# Default to Postgres service name "postgres" in docker-compose.yml
7PEERTUBE_DB_HOSTNAME=postgres 12PEERTUBE_DB_HOSTNAME=postgres
13
14# Server configuration
8PEERTUBE_WEBSERVER_HOSTNAME=<MY DOMAIN> 15PEERTUBE_WEBSERVER_HOSTNAME=<MY DOMAIN>
9PEERTUBE_WEBSERVER_PORT=443 16# If you do not use https and a reverse-proxy in docker-compose.yml
10PEERTUBE_WEBSERVER_HTTPS=true 17#PEERTUBE_WEBSERVER_PORT=80
18#PEERTUBE_WEBSERVER_HTTPS=false
11# If you need more than one IP as trust_proxy 19# If you need more than one IP as trust_proxy
12# pass them as a comma separated array: 20# pass them as a comma separated array:
13PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] 21PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
22
23# E-mail configuration
24# If you use a Custom SMTP server
14#PEERTUBE_SMTP_USERNAME= 25#PEERTUBE_SMTP_USERNAME=
15#PEERTUBE_SMTP_PASSWORD= 26#PEERTUBE_SMTP_PASSWORD=
27# Default to Postfix service name "postfix" in docker-compose.yml
28# May be the hostname of your Custom SMTP server
16PEERTUBE_SMTP_HOSTNAME=postfix 29PEERTUBE_SMTP_HOSTNAME=postfix
17PEERTUBE_SMTP_PORT=25 30PEERTUBE_SMTP_PORT=25
18PEERTUBE_SMTP_FROM=noreply@<MY DOMAIN> 31PEERTUBE_SMTP_FROM=noreply@<MY DOMAIN>
19PEERTUBE_SMTP_TLS=false 32PEERTUBE_SMTP_TLS=false
20PEERTUBE_SMTP_DISABLE_STARTTLS=false 33PEERTUBE_SMTP_DISABLE_STARTTLS=false
21PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS> 34PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS>
35
36# Postfix service configuration
22POSTFIX_myhostname=<MY DOMAIN> 37POSTFIX_myhostname=<MY DOMAIN>
23# If you need to generate a list of sub/DOMAIN keys 38# If you need to generate a list of sub/DOMAIN keys
24# pass them as a whitespace separated string <DOMAIN>=<selector> 39# pass them as a whitespace separated string <DOMAIN>=<selector>
25OPENDKIM_DOMAINS=<MY DOMAIN>=peertube 40OPENDKIM_DOMAINS=<MY DOMAIN>=peertube
41
42# Let's Encrypt service configuration
26TRAEFIK_ACME_EMAIL=<MY EMAIL ADDRESS> 43TRAEFIK_ACME_EMAIL=<MY EMAIL ADDRESS>
27# If you need to obtain ACME certificates for more than one DOMAIN 44# If you need to obtain ACME certificates for more than one DOMAIN
28# pass them as a comma separated string 45# pass them as a comma separated string
29TRAEFIK_ACME_DOMAINS=<MY DOMAIN> 46TRAEFIK_ACME_DOMAINS=<MY DOMAIN>
47
30# /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\ 48# /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
31#PEERTUBE_SIGNUP_ENABLED=true 49#PEERTUBE_SIGNUP_ENABLED=true
32#PEERTUBE_TRANSCODING_ENABLED=true 50#PEERTUBE_TRANSCODING_ENABLED=true