From e2882b2ccba99f9cf94878f597b24c5185560a86 Mon Sep 17 00:00:00 2001
From: Leopere <1068374+Leopere@users.noreply.github.com>
Date: Mon, 18 Nov 2019 03:38:05 -0500
Subject: Sticking to one env-var management system (#2247)

* Sticking to one env-var management system

Starting with the Postgres container so that you only have to set overlapping environment variables in one place.

* Moving Postfix envvars pt 1

* Moving Postfix envvars pt 2 .env file

* Added missing envvars.

* Adding functioning glue

Suggest something better if you wish.

* removed IP from example

* Removed default network from update.
---
 support/docker/production/.env | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'support/docker/production/.env')

diff --git a/support/docker/production/.env b/support/docker/production/.env
index c8393d0ce..95ca42d69 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -1,5 +1,9 @@
-PEERTUBE_DB_USERNAME=postgres_user
-PEERTUBE_DB_PASSWORD=postgres_password
+POSTGRES_USER=peertube
+POSTGRES_PASSWORD=peertube
+POSTGRES_DB=peertube
+PEERTUBE_DB_USERNAME=$(POSTGRES_USER)
+PEERTUBE_DB_PASSWORD=$(POSTGRES_PASSWORD)
+PEERTUBE_DB_HOSTNAME=postgres
 PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
@@ -14,6 +18,7 @@ PEERTUBE_SMTP_FROM=noreply@domain.tld
 PEERTUBE_SMTP_TLS=false
 PEERTUBE_SMTP_DISABLE_STARTTLS=false
 PEERTUBE_ADMIN_EMAIL=admin@domain.tld
+POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME}
 # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
 #PEERTUBE_SIGNUP_ENABLED=true
 #PEERTUBE_TRANSCODING_ENABLED=true
-- 
cgit v1.2.3