aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-22 16:12:52 +0100
committerChocobozzz <me@florianbigard.com>2018-03-22 16:12:52 +0100
commitbebf2d89d335c48659d2e25cb9f6f8310e867fc5 (patch)
tree49548611f335073cd9988c4c5d87a113a1f65cc0 /config
parenta38b297d90a35abc8d5308f74eb2d2b64cef7c21 (diff)
downloadPeerTube-bebf2d89d335c48659d2e25cb9f6f8310e867fc5.tar.gz
PeerTube-bebf2d89d335c48659d2e25cb9f6f8310e867fc5.tar.zst
PeerTube-bebf2d89d335c48659d2e25cb9f6f8310e867fc5.zip
Add option to disable starttls
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml1
-rw-r--r--config/production.yaml.example1
-rw-r--r--config/test.yaml1
3 files changed, 3 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 48e5bd067..26fc5c128 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -25,6 +25,7 @@ smtp:
25 username: null 25 username: null
26 password: null 26 password: null
27 tls: true 27 tls: true
28 disable_starttls: false
28 ca_file: null # Used for self signed certificates 29 ca_file: null # Used for self signed certificates
29 from_address: 'admin@example.com' 30 from_address: 'admin@example.com'
30 31
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 45eeffec7..43f45ae80 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -26,6 +26,7 @@ smtp:
26 username: null 26 username: null
27 password: null 27 password: null
28 tls: true 28 tls: true
29 disable_starttls: false
29 ca_file: null # Used for self signed certificates 30 ca_file: null # Used for self signed certificates
30 from_address: 'admin@example.com' 31 from_address: 'admin@example.com'
31 32
diff --git a/config/test.yaml b/config/test.yaml
index b830a42e7..7e395db04 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -12,6 +12,7 @@ smtp:
12 hostname: null 12 hostname: null
13 port: 1025 13 port: 1025
14 tls: false 14 tls: false
15 disable_starttls: true
15 from_address: 'test-admin@localhost' 16 from_address: 'test-admin@localhost'
16 username: null 17 username: null
17 password: null 18 password: null