From 148ab2f0f043a4c7cc28f9497cb6ae3819e8b838 Mon Sep 17 00:00:00 2001
From: Kim <1877318+kimsible@users.noreply.github.com>
Date: Mon, 18 May 2020 17:50:58 +0200
Subject: [PATCH] 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>
---
 support/doc/docker.md          |  1 -
 support/docker/production/.env | 26 ++++++++++++++++++++++----
 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
 In the downloaded example [.env](https://github.com/Chocobozzz/PeerTube/blob/master/support/docker/production/.env), you must replace:
 - `<MY POSTGRES USERNAME>`
 - `<MY POSTGRES PASSWORD>`
-- `<MY POSTGRES DB>`
 - `<MY DOMAIN>` without 'https://'
 - `<MY EMAIL ADDRESS>`
 
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 @@
+# Database / Postgres service configuration
 POSTGRES_USER=<MY POSTGRES USERNAME>
 POSTGRES_PASSWORD=<MY POSTGRES PASSWORD>
-POSTGRES_DB=<MY 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=<MY POSTGRES USERNAME>
 PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD>
-# PEERTUBE_DB_HOSTNAME is the Postgres service name in docker-compose.yml
+# Default to Postgres service name "postgres" in docker-compose.yml
 PEERTUBE_DB_HOSTNAME=postgres
+
+# Server configuration
 PEERTUBE_WEBSERVER_HOSTNAME=<MY DOMAIN>
-PEERTUBE_WEBSERVER_PORT=443
-PEERTUBE_WEBSERVER_HTTPS=true
+# 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"]
+
+# E-mail configuration
+# If you use a Custom SMTP server
 #PEERTUBE_SMTP_USERNAME=
 #PEERTUBE_SMTP_PASSWORD=
+# 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@<MY DOMAIN>
 PEERTUBE_SMTP_TLS=false
 PEERTUBE_SMTP_DISABLE_STARTTLS=false
 PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS>
+
+# Postfix service configuration
 POSTFIX_myhostname=<MY DOMAIN>
 # If you need to generate a list of sub/DOMAIN keys
 # pass them as a whitespace separated string <DOMAIN>=<selector>
 OPENDKIM_DOMAINS=<MY DOMAIN>=peertube
+
+# Let's Encrypt service configuration
 TRAEFIK_ACME_EMAIL=<MY EMAIL ADDRESS>
 # If you need to obtain ACME certificates for more than one DOMAIN
 # pass them as a comma separated string
 TRAEFIK_ACME_DOMAINS=<MY DOMAIN>
+
 # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
 #PEERTUBE_SIGNUP_ENABLED=true
 #PEERTUBE_TRANSCODING_ENABLED=true
-- 
2.41.0