Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / support / docker / production / .env

diff --git a/support/docker/production/.env b/support/docker/production/.env
index 7b9092642b22786c5364766b1f262ad1262bd0ab..95ca42d6971ad5438ee02ceb3e4bb0ead3893743 100644 (file)
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -1,12 +1,15 @@
-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
 # If you need more than one IP as trust_proxy
 # pass them as a comma separated array:
-PEERTUBE_TRUST_PROXY=["127.0.0.1"]
-#PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "192.168.1.0/24"]
+PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
 #PEERTUBE_SMTP_USERNAME=
 #PEERTUBE_SMTP_PASSWORD=
 PEERTUBE_SMTP_HOSTNAME=postfix
@@ -15,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