From 6401417d6c17f827c94e44dd27c85c771442630b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 29 May 2018 10:28:08 +0200 Subject: [PATCH] Add help in conf file regarding SMTP --- config/default.yaml | 4 +++- config/production.yaml.example | 6 +++--- support/docker/production/docker-compose.yml | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index f43cbaf4b..b5ad0a8f2 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -1,3 +1,5 @@ +# /!\ YOU SHOULD NOT UPDATE THIS FILE, USE production.yaml instead /!\ # + listen: hostname: '127.0.0.1' port: 9000 @@ -60,7 +62,7 @@ admin: signup: enabled: false limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited - filters: + filters: cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist whitelist: [] blacklist: [] diff --git a/config/production.yaml.example b/config/production.yaml.example index a9d2c3b80..a11f0a1d6 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -32,10 +32,10 @@ redis: # SMTP server to send emails smtp: hostname: null - port: 465 + port: 465 # If you use StartTLS: 587 username: null password: null - tls: true + tls: true # If you use StartTLS: false disable_starttls: false ca_file: null # Used for self signed certificates from_address: 'admin@example.com' @@ -76,7 +76,7 @@ admin: signup: enabled: false limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited - filters: + filters: cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist whitelist: [] blacklist: [] diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index 5f8822ad3..32ee75113 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -32,6 +32,8 @@ services: PEERTUBE_SIGNUP_ENABLED: "true" PEERTUBE_TRANSCODING_ENABLED: "true" PEERTUBE_REDIS_HOSTNAME: redis + PEERTUBE_SMTP_USERNAME: null + PEERTUBE_SMTP_PASSWORD: null PEERTUBE_SMTP_HOSTNAME: null PEERTUBE_SMTP_PORT: 25 PEERTUBE_SMTP_FROM: noreply@peertube.domain.tld -- 2.25.1