diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-03-11 11:11:00 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-03-11 11:11:00 +0100 |
| commit | 4495806f2f5045a0626ab64f43b5fc4deefe2ac0 (patch) | |
| tree | e83b61b8da313fe1add571b9dd73261828c38cf9 /config | |
| parent | 052bdb7c120b2ac7a1616a8072f9eedd2ab2f4b6 (diff) | |
| parent | 58ae266bada2233945c4446220c22ccc4e7c62b5 (diff) | |
| download | PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.tar.gz PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.tar.zst PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.zip | |
Merge remote-tracking branch 'weblate/develop' into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 6 | ||||
| -rw-r--r-- | config/production.yaml.example | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index d76894b52..898395705 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -392,6 +392,12 @@ live: | |||
| 392 | # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay | 392 | # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay |
| 393 | allow_replay: true | 393 | allow_replay: true |
| 394 | 394 | ||
| 395 | # Allow your users to change latency settings (small latency/default/high latency) | ||
| 396 | # Small latency live streams cannot use P2P | ||
| 397 | # High latency live streams can increase P2P ratio | ||
| 398 | latency_setting: | ||
| 399 | enabled: true | ||
| 400 | |||
| 395 | # Your firewall should accept traffic from this port in TCP if you enable live | 401 | # Your firewall should accept traffic from this port in TCP if you enable live |
| 396 | rtmp: | 402 | rtmp: |
| 397 | enabled: true | 403 | enabled: true |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 45d26190a..03afe5841 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -400,6 +400,12 @@ live: | |||
| 400 | # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay | 400 | # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay |
| 401 | allow_replay: true | 401 | allow_replay: true |
| 402 | 402 | ||
| 403 | # Allow your users to change latency settings (small latency/default/high latency) | ||
| 404 | # Small latency live streams cannot use P2P | ||
| 405 | # High latency live streams can increase P2P ratio | ||
| 406 | latency_setting: | ||
| 407 | enabled: true | ||
| 408 | |||
| 403 | # Your firewall should accept traffic from this port in TCP if you enable live | 409 | # Your firewall should accept traffic from this port in TCP if you enable live |
| 404 | rtmp: | 410 | rtmp: |
| 405 | enabled: true | 411 | enabled: true |