4 files changed, 24 insertions, 21 deletions

diff --git a/support/docker/production/.env b/support/docker/production/.env
index 95ca42d69..4743b68db 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -1,10 +1,11 @@
-POSTGRES_USER=peertube
-POSTGRES_PASSWORD=peertube
-POSTGRES_DB=peertube
-PEERTUBE_DB_USERNAME=$(POSTGRES_USER)
-PEERTUBE_DB_PASSWORD=$(POSTGRES_PASSWORD)
+POSTGRES_USER=<MY POSTGRES USERNAME>
+POSTGRES_PASSWORD=<MY POSTGRES PASSWORD>
+POSTGRES_DB=<MY POSTGRES DB>
+PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME>
+PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD>
+# PEERTUBE_DB_HOSTNAME is the Postgres service name in docker-compose.yml
 PEERTUBE_DB_HOSTNAME=postgres
-PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
+PEERTUBE_WEBSERVER_HOSTNAME=<MY DOMAIN>
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
 # If you need more than one IP as trust_proxy
@@ -14,11 +15,18 @@ PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
 #PEERTUBE_SMTP_PASSWORD=
 PEERTUBE_SMTP_HOSTNAME=postfix
 PEERTUBE_SMTP_PORT=25
-PEERTUBE_SMTP_FROM=noreply@domain.tld
+PEERTUBE_SMTP_FROM=noreply@<MY DOMAIN>
 PEERTUBE_SMTP_TLS=false
 PEERTUBE_SMTP_DISABLE_STARTTLS=false
-PEERTUBE_ADMIN_EMAIL=admin@domain.tld
-POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME}
+PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS>
+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
+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
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index 2ac3c8f44..58b41a493 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -45,6 +45,7 @@ storage:
   tmp: '../data/tmp/'
   avatars: '../data/avatars/'
   videos: '../data/videos/'
+  streaming_playlists: '../data/streaming-playlists'
   redundancy: '../data/redundancy/'
   logs: '../data/logs/'
   previews: '../data/previews/'
diff --git a/support/docker/production/config/traefik.toml b/support/docker/production/config/traefik.toml
index 6abced3db..1d7d207fd 100644
--- a/support/docker/production/config/traefik.toml
+++ b/support/docker/production/config/traefik.toml
@@ -37,12 +37,6 @@ defaultEntryPoints = ["http", "https"]
 # Enable ACME (Let's Encrypt): automatic SSL.
 [acme]
 
-# Email address used for registration.
-#
-# Required
-#
-email = "<MY EMAIL ADDRESS>"
-
 # File or key used for certificates storage.
 #
 # Required
@@ -57,11 +51,6 @@ storage = "/etc/acme.json"
 #
 entryPoint = "https"
 
-# Domains list.
-#
-[[acme.domains]]
-  main = "<MY DOMAIN>"
-
 # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge
 #
 # Optional but recommend
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index b81a8745b..e937c8b9c 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -5,7 +5,10 @@ services:
   reverse-proxy:
     image: traefik:v1.7
     network_mode: "host"
-    command: --docker # Tells Træfik to listen to docker
+    command:
+      - "--docker" # Tells Træfik to listen to docker
+      - "--acme.email=${TRAEFIK_ACME_EMAIL}" # Let's Encrypt ACME email
+      - "--acme.domains=${TRAEFIK_ACME_DOMAINS}" # Let's Encrypt ACME domain list
     ports:
       - "80:80"     # The HTTP port
       - "443:443"   # The HTTPS port
@@ -67,6 +70,8 @@ services:
     image: mwader/postfix-relay
     env_file:
       - .env
+    volumes:
+      - ./docker-volume/opendkim/keys:/etc/opendkim/keys
     labels:
       traefik.enable: "false"
     restart: "always"