From 6500a90cfeadae4959b73578612dc4a9cd917f05 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Tue, 6 Feb 2018 08:37:36 +0100
Subject: [PATCH] Expose SMTP and instance settings in the Docker environment
 variables (#277)

---
 .../config/custom-environment-variables.yaml    | 17 +++++++++++++++++
 .../docker/production/config/production.yaml    | 16 ++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 5226e1742..9139125a5 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -23,6 +23,18 @@ redis:
     __format: "json"
   auth: "PEERTUBE_REDIS_AUTH"
 
+smtp:
+  hostname: "PEERTUBE_SMTP_HOSTNAME"
+  port:
+    __name: "PEERTUBE_SMTP_PORT"
+    __format: "json"
+  username: "PEERTUBE_SMTP_USERNAME"
+  password: "PEERTUBE_SMTP_PASSWORD"
+  tls:
+    __name: "PEERTUBE_SMTP_TLS"
+    __format: "json"
+  form_address: "PEERTUBE_ADMIN_EMAIL"
+
 admin:
   email: "PEERTUBE_ADMIN_EMAIL"
 
@@ -38,3 +50,8 @@ transcoding:
   enabled:
     __name: "PEERTUBE_TRANSCODING_ENABLED"
     __format: "json"
+
+instance:
+  name: "PEERTUBE_INSTANCE_NAME"
+  description: "PEERTUBE_INSTANCE_DESCRIPTION"
+  terms: "PEERTUBE_INSTANCE_TERMS"
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index 4666ea2ed..3cc72e573 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -21,6 +21,16 @@ redis:
   port: 6379
   auth: null
 
+# SMTP server to send emails
+smtp:
+  hostname: null
+  port: 465
+  username: null
+  password: null
+  tls: true
+  ca_file: null # Used for self signed certificates
+  from_address: 'admin@example.com'
+
 # From the project root directory
 storage:
   avatars: '../data/avatars/'
@@ -62,3 +72,9 @@ transcoding:
     480p: true
     720p: true
     1080p: true
+
+# Instance settings
+instance:
+  name: 'PeerTube'
+  description: '' # Support markdown
+  terms: '' # Support markdown
-- 
2.25.1