diff options
author | Chocobozzz <me@florianbigard.com> | 2021-01-29 14:56:40 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-01-29 14:56:40 +0100 |
commit | 3258fa5525c09402c7d4c21c86f30ee3f3366424 (patch) | |
tree | de5c189f1c20012106d7055f93f157c9735b0cc3 /config/default.yaml | |
parent | d0dd9813d563ecd3f7ec6342d922a1534e182bd8 (diff) | |
download | PeerTube-3258fa5525c09402c7d4c21c86f30ee3f3366424.tar.gz PeerTube-3258fa5525c09402c7d4c21c86f30ee3f3366424.tar.zst PeerTube-3258fa5525c09402c7d4c21c86f30ee3f3366424.zip |
Fix default.yaml and production.yaml inconsistencies
Diffstat (limited to 'config/default.yaml')
-rw-r--r-- | config/default.yaml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/config/default.yaml b/config/default.yaml index 283e0ab93..22488da99 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -14,7 +14,7 @@ rates_limit: | |||
14 | api: | 14 | api: |
15 | # 50 attempts in 10 seconds | 15 | # 50 attempts in 10 seconds |
16 | window: 10 seconds | 16 | window: 10 seconds |
17 | max: 100 | 17 | max: 50 |
18 | login: | 18 | login: |
19 | # 15 attempts in 5 min | 19 | # 15 attempts in 5 min |
20 | window: 5 minutes | 20 | window: 5 minutes |
@@ -45,6 +45,7 @@ database: | |||
45 | pool: | 45 | pool: |
46 | max: 5 | 46 | max: 5 |
47 | 47 | ||
48 | # Redis server for short time storage | ||
48 | # You can also specify a 'socket' path to a unix socket but first need to | 49 | # You can also specify a 'socket' path to a unix socket but first need to |
49 | # comment out hostname and port | 50 | # comment out hostname and port |
50 | redis: | 51 | redis: |
@@ -53,16 +54,17 @@ redis: | |||
53 | auth: null | 54 | auth: null |
54 | db: 0 | 55 | db: 0 |
55 | 56 | ||
57 | # SMTP server to send emails | ||
56 | smtp: | 58 | smtp: |
57 | # smtp or sendmail | 59 | # smtp or sendmail |
58 | transport: smtp | 60 | transport: smtp |
59 | # Path to sendmail command. Required if you use sendmail transport | 61 | # Path to sendmail command. Required if you use sendmail transport |
60 | sendmail: null | 62 | sendmail: null |
61 | hostname: null | 63 | hostname: null |
62 | port: 465 | 64 | port: 465 # If you use StartTLS: 587 |
63 | username: null | 65 | username: null |
64 | password: null | 66 | password: null |
65 | tls: true | 67 | tls: true # If you use StartTLS: false |
66 | disable_starttls: false | 68 | disable_starttls: false |
67 | ca_file: null # Used for self signed certificates | 69 | ca_file: null # Used for self signed certificates |
68 | from_address: 'admin@example.com' | 70 | from_address: 'admin@example.com' |
@@ -96,7 +98,7 @@ storage: | |||
96 | log: | 98 | log: |
97 | level: 'info' # debug/info/warning/error | 99 | level: 'info' # debug/info/warning/error |
98 | rotation: | 100 | rotation: |
99 | enabled : true | 101 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate |
100 | maxFileSize: 12MB | 102 | maxFileSize: 12MB |
101 | maxFiles: 20 | 103 | maxFiles: 20 |
102 | anonymizeIP: false | 104 | anonymizeIP: false |
@@ -281,7 +283,7 @@ live: | |||
281 | # PeerTube will transcode segments in a video file | 283 | # PeerTube will transcode segments in a video file |
282 | # If the user daily/total quota is reached, PeerTube will stop the live | 284 | # If the user daily/total quota is reached, PeerTube will stop the live |
283 | # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay | 285 | # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay |
284 | allow_replay: false | 286 | allow_replay: true |
285 | 287 | ||
286 | # Your firewall should accept traffic from this port in TCP if you enable live | 288 | # Your firewall should accept traffic from this port in TCP if you enable live |
287 | rtmp: | 289 | rtmp: |
@@ -328,6 +330,7 @@ auto_blacklist: | |||
328 | of_users: | 330 | of_users: |
329 | enabled: false | 331 | enabled: false |
330 | 332 | ||
333 | # Instance settings | ||
331 | instance: | 334 | instance: |
332 | name: 'PeerTube' | 335 | name: 'PeerTube' |
333 | short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.' | 336 | short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.' |
@@ -425,7 +428,6 @@ followers: | |||
425 | followings: | 428 | followings: |
426 | instance: | 429 | instance: |
427 | # If you want to automatically follow back new instance followers | 430 | # If you want to automatically follow back new instance followers |
428 | # Only follows accepted followers (in case you enabled manual followers approbation) | ||
429 | # If this option is enabled, use the mute feature instead of deleting followings | 431 | # If this option is enabled, use the mute feature instead of deleting followings |
430 | # /!\ Don't enable this if you don't have a reactive moderation team /!\ | 432 | # /!\ Don't enable this if you don't have a reactive moderation team /!\ |
431 | auto_follow_back: | 433 | auto_follow_back: |