diff options
author | kaiyou <pierre@jaury.eu> | 2018-02-06 08:37:36 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-02-06 08:37:36 +0100 |
commit | 6500a90cfeadae4959b73578612dc4a9cd917f05 (patch) | |
tree | 6bfa287cf10761b274ec0688ee4582dd3043ec83 /support/docker/production | |
parent | 3c75ce12d5bbe34c3a97dc68ec75c7afed149f9d (diff) | |
download | PeerTube-6500a90cfeadae4959b73578612dc4a9cd917f05.tar.gz PeerTube-6500a90cfeadae4959b73578612dc4a9cd917f05.tar.zst PeerTube-6500a90cfeadae4959b73578612dc4a9cd917f05.zip |
Expose SMTP and instance settings in the Docker environment variables (#277)
Diffstat (limited to 'support/docker/production')
-rw-r--r-- | support/docker/production/config/custom-environment-variables.yaml | 17 | ||||
-rw-r--r-- | support/docker/production/config/production.yaml | 16 |
2 files changed, 33 insertions, 0 deletions
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: | |||
23 | __format: "json" | 23 | __format: "json" |
24 | auth: "PEERTUBE_REDIS_AUTH" | 24 | auth: "PEERTUBE_REDIS_AUTH" |
25 | 25 | ||
26 | smtp: | ||
27 | hostname: "PEERTUBE_SMTP_HOSTNAME" | ||
28 | port: | ||
29 | __name: "PEERTUBE_SMTP_PORT" | ||
30 | __format: "json" | ||
31 | username: "PEERTUBE_SMTP_USERNAME" | ||
32 | password: "PEERTUBE_SMTP_PASSWORD" | ||
33 | tls: | ||
34 | __name: "PEERTUBE_SMTP_TLS" | ||
35 | __format: "json" | ||
36 | form_address: "PEERTUBE_ADMIN_EMAIL" | ||
37 | |||
26 | admin: | 38 | admin: |
27 | email: "PEERTUBE_ADMIN_EMAIL" | 39 | email: "PEERTUBE_ADMIN_EMAIL" |
28 | 40 | ||
@@ -38,3 +50,8 @@ transcoding: | |||
38 | enabled: | 50 | enabled: |
39 | __name: "PEERTUBE_TRANSCODING_ENABLED" | 51 | __name: "PEERTUBE_TRANSCODING_ENABLED" |
40 | __format: "json" | 52 | __format: "json" |
53 | |||
54 | instance: | ||
55 | name: "PEERTUBE_INSTANCE_NAME" | ||
56 | description: "PEERTUBE_INSTANCE_DESCRIPTION" | ||
57 | 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: | |||
21 | port: 6379 | 21 | port: 6379 |
22 | auth: null | 22 | auth: null |
23 | 23 | ||
24 | # SMTP server to send emails | ||
25 | smtp: | ||
26 | hostname: null | ||
27 | port: 465 | ||
28 | username: null | ||
29 | password: null | ||
30 | tls: true | ||
31 | ca_file: null # Used for self signed certificates | ||
32 | from_address: 'admin@example.com' | ||
33 | |||
24 | # From the project root directory | 34 | # From the project root directory |
25 | storage: | 35 | storage: |
26 | avatars: '../data/avatars/' | 36 | avatars: '../data/avatars/' |
@@ -62,3 +72,9 @@ transcoding: | |||
62 | 480p: true | 72 | 480p: true |
63 | 720p: true | 73 | 720p: true |
64 | 1080p: true | 74 | 1080p: true |
75 | |||
76 | # Instance settings | ||
77 | instance: | ||
78 | name: 'PeerTube' | ||
79 | description: '' # Support markdown | ||
80 | terms: '' # Support markdown | ||