From 7fccc66d3a023c5156f479182c538d508db7c02f Mon Sep 17 00:00:00 2001 From: kimsible Date: Thu, 5 Mar 2020 09:23:34 +0100 Subject: [PATCH 1/5] chore: remove unused var --- support/doc/docker.md | 1 - 1 file changed, 1 deletion(-) diff --git a/support/doc/docker.md b/support/doc/docker.md index 99aa688a971..8623173cb2c 100644 --- a/support/doc/docker.md +++ b/support/doc/docker.md @@ -84,7 +84,6 @@ vim ./.env In the downloaded example [.env](https://github.com/Chocobozzz/PeerTube/blob/master/support/docker/production/.env), you must replace: - `` - `` -- `` - `` without 'https://' - `` From 5a24b75e51991b4aaf15822d863c77abb5390aba Mon Sep 17 00:00:00 2001 From: kimsible Date: Thu, 5 Mar 2020 09:25:32 +0100 Subject: [PATCH 2/5] fix database name as peertube + update comments --- support/docker/production/.env | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/docker/production/.env b/support/docker/production/.env index 4743b68db41..60bc46c1de9 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -1,9 +1,13 @@ POSTGRES_USER= POSTGRES_PASSWORD= -POSTGRES_DB= +# Postgres database name "peertube" +POSTGRES_DB=peertube +# Editable only with a suffix : +#POSTGRES_DB=peertube_prod +#PEERTUBE_DB_SUFFIX=_prod PEERTUBE_DB_USERNAME= PEERTUBE_DB_PASSWORD= -# PEERTUBE_DB_HOSTNAME is the Postgres service name in docker-compose.yml +# Postgres service name "postgres" in docker-compose.yml PEERTUBE_DB_HOSTNAME=postgres PEERTUBE_WEBSERVER_HOSTNAME= PEERTUBE_WEBSERVER_PORT=443 @@ -13,6 +17,7 @@ PEERTUBE_WEBSERVER_HTTPS=true PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] #PEERTUBE_SMTP_USERNAME= #PEERTUBE_SMTP_PASSWORD= +# Postfix service name "postfix" in docker-compose.yml PEERTUBE_SMTP_HOSTNAME=postfix PEERTUBE_SMTP_PORT=25 PEERTUBE_SMTP_FROM=noreply@ From 612d64be2c545b98ce39cf4a18801f110288d956 Mon Sep 17 00:00:00 2001 From: kimsible Date: Thu, 5 Mar 2020 09:27:14 +0100 Subject: [PATCH 3/5] chore: comment vars indentic to production.yrml --- support/docker/production/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/production/.env b/support/docker/production/.env index 60bc46c1de9..9f46c99c9fe 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -10,8 +10,8 @@ PEERTUBE_DB_PASSWORD= # Postgres service name "postgres" in docker-compose.yml PEERTUBE_DB_HOSTNAME=postgres PEERTUBE_WEBSERVER_HOSTNAME= -PEERTUBE_WEBSERVER_PORT=443 -PEERTUBE_WEBSERVER_HTTPS=true +#PEERTUBE_WEBSERVER_PORT= +#PEERTUBE_WEBSERVER_HTTPS= # If you need more than one IP as trust_proxy # pass them as a comma separated array: PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] From 798c2c4c4b6cea452665d07292b5fed312ce498b Mon Sep 17 00:00:00 2001 From: kimsible Date: Tue, 10 Mar 2020 16:21:13 +0100 Subject: [PATCH 4/5] add smtp comment --- support/docker/production/.env | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/production/.env b/support/docker/production/.env index 9f46c99c9fe..93060e24720 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -15,6 +15,7 @@ PEERTUBE_WEBSERVER_HOSTNAME= # If you need more than one IP as trust_proxy # pass them as a comma separated array: PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] +# If you use a custum SMTP server #PEERTUBE_SMTP_USERNAME= #PEERTUBE_SMTP_PASSWORD= # Postfix service name "postfix" in docker-compose.yml From 2b270359291f89f2bf881f305cde90584c9aa644 Mon Sep 17 00:00:00 2001 From: kimsible Date: Tue, 10 Mar 2020 17:20:08 +0100 Subject: [PATCH 5/5] clarify and detail comments --- support/docker/production/.env | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/support/docker/production/.env b/support/docker/production/.env index 93060e24720..8ed9b062b8a 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -1,3 +1,4 @@ +# Database / Postgres service configuration POSTGRES_USER= POSTGRES_PASSWORD= # Postgres database name "peertube" @@ -7,32 +8,43 @@ POSTGRES_DB=peertube #PEERTUBE_DB_SUFFIX=_prod PEERTUBE_DB_USERNAME= PEERTUBE_DB_PASSWORD= -# Postgres service name "postgres" in docker-compose.yml +# Default to Postgres service name "postgres" in docker-compose.yml PEERTUBE_DB_HOSTNAME=postgres + +# Server configuration PEERTUBE_WEBSERVER_HOSTNAME= -#PEERTUBE_WEBSERVER_PORT= -#PEERTUBE_WEBSERVER_HTTPS= +# If you do not use https and a reverse-proxy in docker-compose.yml +#PEERTUBE_WEBSERVER_PORT=80 +#PEERTUBE_WEBSERVER_HTTPS=false # If you need more than one IP as trust_proxy # pass them as a comma separated array: PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] -# If you use a custum SMTP server + +# E-mail configuration +# If you use a Custom SMTP server #PEERTUBE_SMTP_USERNAME= #PEERTUBE_SMTP_PASSWORD= -# Postfix service name "postfix" in docker-compose.yml +# Default to Postfix service name "postfix" in docker-compose.yml +# May be the hostname of your Custom SMTP server PEERTUBE_SMTP_HOSTNAME=postfix PEERTUBE_SMTP_PORT=25 PEERTUBE_SMTP_FROM=noreply@ PEERTUBE_SMTP_TLS=false PEERTUBE_SMTP_DISABLE_STARTTLS=false PEERTUBE_ADMIN_EMAIL= + +# Postfix service configuration POSTFIX_myhostname= # If you need to generate a list of sub/DOMAIN keys # pass them as a whitespace separated string = OPENDKIM_DOMAINS==peertube + +# Let's Encrypt service configuration TRAEFIK_ACME_EMAIL= # If you need to obtain ACME certificates for more than one DOMAIN # pass them as a comma separated string TRAEFIK_ACME_DOMAINS= + # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\ #PEERTUBE_SIGNUP_ENABLED=true #PEERTUBE_TRANSCODING_ENABLED=true