forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix default.yaml and production.yaml inconsistencies

This commit is contained in:
Chocobozzz 2021-01-29 14:56:40 +01:00
parent d0dd9813d5
commit 3258fa5525
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/default.yaml
View File

@ -14,7 +14,7 @@ rates_limit:
api: api:
# 50 attempts in 10 seconds # 50 attempts in 10 seconds
window: 10 seconds window: 10 seconds
max: 100 max: 50
login: login:
# 15 attempts in 5 min # 15 attempts in 5 min
window: 5 minutes window: 5 minutes
@ -45,6 +45,7 @@ database:
pool: pool:
max: 5 max: 5
# Redis server for short time storage
# You can also specify a 'socket' path to a unix socket but first need to # You can also specify a 'socket' path to a unix socket but first need to
# comment out hostname and port # comment out hostname and port
redis: redis:
@ -53,16 +54,17 @@ redis:
auth: null auth: null
db: 0 db: 0
# SMTP server to send emails
smtp: smtp:
# smtp or sendmail # smtp or sendmail
transport: smtp transport: smtp
# Path to sendmail command. Required if you use sendmail transport # Path to sendmail command. Required if you use sendmail transport
sendmail: null sendmail: null
hostname: null hostname: null
port: 465 port: 465 # If you use StartTLS: 587
username: null username: null
password: null password: null
tls: true tls: true # If you use StartTLS: false
disable_starttls: false disable_starttls: false
ca_file: null # Used for self signed certificates ca_file: null # Used for self signed certificates
from_address: 'admin@example.com' from_address: 'admin@example.com'
@ -96,7 +98,7 @@ storage:
log: log:
level: 'info' # debug/info/warning/error level: 'info' # debug/info/warning/error
rotation: rotation:
enabled : true enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate
maxFileSize: 12MB maxFileSize: 12MB
maxFiles: 20 maxFiles: 20
anonymizeIP: false anonymizeIP: false
@ -281,7 +283,7 @@ live:
# PeerTube will transcode segments in a video file # PeerTube will transcode segments in a video file
# If the user daily/total quota is reached, PeerTube will stop the live # If the user daily/total quota is reached, PeerTube will stop the live
# /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
allow_replay: false allow_replay: true
# Your firewall should accept traffic from this port in TCP if you enable live # Your firewall should accept traffic from this port in TCP if you enable live
rtmp: rtmp:
@ -328,6 +330,7 @@ auto_blacklist:
of_users: of_users:
enabled: false enabled: false
# Instance settings
instance: instance:
name: 'PeerTube' name: 'PeerTube'
short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.' short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
@ -425,7 +428,6 @@ followers:
followings: followings:
instance: instance:
# If you want to automatically follow back new instance followers # If you want to automatically follow back new instance followers
# Only follows accepted followers (in case you enabled manual followers approbation)
# If this option is enabled, use the mute feature instead of deleting followings # If this option is enabled, use the mute feature instead of deleting followings
# /!\ Don't enable this if you don't have a reactive moderation team /!\ # /!\ Don't enable this if you don't have a reactive moderation team /!\
auto_follow_back: auto_follow_back:

2
config/test.yaml
View File

@ -86,6 +86,8 @@ transcoding:
live: live:
enabled: false enabled: false
allow_replay: false
rtmp: rtmp:
port: 1935 port: 1935