diff options
author | Chocobozzz <me@florianbigard.com> | 2023-04-21 14:55:10 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2023-05-09 08:57:34 +0200 |
commit | 0c9668f77901e7540e2c7045eb0f2974a4842a69 (patch) | |
tree | 226d3dd1565b0bb56588897af3b8530e6216e96b /config | |
parent | 6bcb854cdea8688a32240bc5719c7d139806e00b (diff) | |
download | PeerTube-0c9668f77901e7540e2c7045eb0f2974a4842a69.tar.gz PeerTube-0c9668f77901e7540e2c7045eb0f2974a4842a69.tar.zst PeerTube-0c9668f77901e7540e2c7045eb0f2974a4842a69.zip |
Implement remote runner jobs in server
Move ffmpeg functions to @shared
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 30 | ||||
-rw-r--r-- | config/production.yaml.example | 34 |
2 files changed, 52 insertions, 12 deletions
diff --git a/config/default.yaml b/config/default.yaml index dfa43a0aa..986b2e999 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -375,6 +375,12 @@ feeds: | |||
375 | # Default number of comments displayed in feeds | 375 | # Default number of comments displayed in feeds |
376 | count: 20 | 376 | count: 20 |
377 | 377 | ||
378 | remote_runners: | ||
379 | # Consider jobs that are processed by a remote runner as stalled after this period of time without any update | ||
380 | stalled_jobs: | ||
381 | live: '30 seconds' | ||
382 | vod: '2 minutes' | ||
383 | |||
378 | cache: | 384 | cache: |
379 | previews: | 385 | previews: |
380 | size: 500 # Max number of previews you want to cache | 386 | size: 500 # Max number of previews you want to cache |
@@ -433,12 +439,18 @@ transcoding: | |||
433 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | 439 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file |
434 | allow_audio_files: true | 440 | allow_audio_files: true |
435 | 441 | ||
436 | # Amount of threads used by ffmpeg for 1 transcoding job | 442 | # Enable remote runners to transcode your videos |
443 | # If enabled, your instance won't transcode the videos itself | ||
444 | # At least 1 remote runner must be configured to transcode your videos | ||
445 | remote_runners: | ||
446 | enabled: false | ||
447 | |||
448 | # Amount of threads used by ffmpeg for 1 local transcoding job | ||
437 | threads: 1 | 449 | threads: 1 |
438 | # Amount of transcoding jobs to execute in parallel | 450 | # Amount of local transcoding jobs to execute in parallel |
439 | concurrency: 1 | 451 | concurrency: 1 |
440 | 452 | ||
441 | # Choose the transcoding profile | 453 | # Choose the local transcoding profile |
442 | # New profiles can be added by plugins | 454 | # New profiles can be added by plugins |
443 | # Available in core PeerTube: 'default' | 455 | # Available in core PeerTube: 'default' |
444 | profile: 'default' | 456 | profile: 'default' |
@@ -533,9 +545,17 @@ live: | |||
533 | # Allow to transcode the live streaming in multiple live resolutions | 545 | # Allow to transcode the live streaming in multiple live resolutions |
534 | transcoding: | 546 | transcoding: |
535 | enabled: true | 547 | enabled: true |
548 | |||
549 | # Enable remote runners to transcode your videos | ||
550 | # If enabled, your instance won't transcode the videos itself | ||
551 | # At least 1 remote runner must be configured to transcode your videos | ||
552 | remote_runners: | ||
553 | enabled: false | ||
554 | |||
555 | # Amount of threads used by ffmpeg per live when using local transcoding | ||
536 | threads: 2 | 556 | threads: 2 |
537 | 557 | ||
538 | # Choose the transcoding profile | 558 | # Choose the local transcoding profile |
539 | # New profiles can be added by plugins | 559 | # New profiles can be added by plugins |
540 | # Available in core PeerTube: 'default' | 560 | # Available in core PeerTube: 'default' |
541 | profile: 'default' | 561 | profile: 'default' |
@@ -754,7 +774,7 @@ search: | |||
754 | search_index: | 774 | search_index: |
755 | enabled: false | 775 | enabled: false |
756 | # URL of the search index, that should use the same search API and routes | 776 | # URL of the search index, that should use the same search API and routes |
757 | # than PeerTube: https://docs.joinpeertube.org/api/rest-reference.html | 777 | # than PeerTube: https://docs.joinpeertube.org/api-rest-reference.html |
758 | # You should deploy your own with https://framagit.org/framasoft/peertube/search-index, | 778 | # You should deploy your own with https://framagit.org/framasoft/peertube/search-index, |
759 | # and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index | 779 | # and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index |
760 | url: '' | 780 | url: '' |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 0fb6ababc..bd01375cd 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -373,6 +373,12 @@ feeds: | |||
373 | # Default number of comments displayed in feeds | 373 | # Default number of comments displayed in feeds |
374 | count: 20 | 374 | count: 20 |
375 | 375 | ||
376 | remote_runners: | ||
377 | # Consider jobs that are processed by a remote runner as stalled after this period of time without any update | ||
378 | stalled_jobs: | ||
379 | live: '30 seconds' | ||
380 | vod: '2 minutes' | ||
381 | |||
376 | ############################################################################### | 382 | ############################################################################### |
377 | # | 383 | # |
378 | # From this point, almost all following keys can be overridden by the web interface | 384 | # From this point, almost all following keys can be overridden by the web interface |
@@ -443,12 +449,18 @@ transcoding: | |||
443 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | 449 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file |
444 | allow_audio_files: true | 450 | allow_audio_files: true |
445 | 451 | ||
446 | # Amount of threads used by ffmpeg for 1 transcoding job | 452 | # Enable remote runners to transcode your videos |
453 | # If enabled, your instance won't transcode the videos itself | ||
454 | # At least 1 remote runner must be configured to transcode your videos | ||
455 | remote_runners: | ||
456 | enabled: false | ||
457 | |||
458 | # Amount of threads used by ffmpeg for 1 local transcoding job | ||
447 | threads: 1 | 459 | threads: 1 |
448 | # Amount of transcoding jobs to execute in parallel | 460 | # Amount of local transcoding jobs to execute in parallel |
449 | concurrency: 1 | 461 | concurrency: 1 |
450 | 462 | ||
451 | # Choose the transcoding profile | 463 | # Choose the local transcoding profile |
452 | # New profiles can be added by plugins | 464 | # New profiles can be added by plugins |
453 | # Available in core PeerTube: 'default' | 465 | # Available in core PeerTube: 'default' |
454 | profile: 'default' | 466 | profile: 'default' |
@@ -543,9 +555,17 @@ live: | |||
543 | # Allow to transcode the live streaming in multiple live resolutions | 555 | # Allow to transcode the live streaming in multiple live resolutions |
544 | transcoding: | 556 | transcoding: |
545 | enabled: true | 557 | enabled: true |
558 | |||
559 | # Enable remote runners to transcode your videos | ||
560 | # If enabled, your instance won't transcode the videos itself | ||
561 | # At least 1 remote runner must be configured to transcode your videos | ||
562 | remote_runners: | ||
563 | enabled: false | ||
564 | |||
565 | # Amount of threads used by ffmpeg per live when using local transcoding | ||
546 | threads: 2 | 566 | threads: 2 |
547 | 567 | ||
548 | # Choose the transcoding profile | 568 | # Choose the local transcoding profile |
549 | # New profiles can be added by plugins | 569 | # New profiles can be added by plugins |
550 | # Available in core PeerTube: 'default' | 570 | # Available in core PeerTube: 'default' |
551 | profile: 'default' | 571 | profile: 'default' |
@@ -607,7 +627,7 @@ import: | |||
607 | # See https://docs.joinpeertube.org/maintain/configuration#security for more information | 627 | # See https://docs.joinpeertube.org/maintain/configuration#security for more information |
608 | enabled: false | 628 | enabled: false |
609 | 629 | ||
610 | # Add ability for your users to synchronize their channels with external channels, playlists, etc. | 630 | # Add ability for your users to synchronize their channels with external channels, playlists, etc |
611 | video_channel_synchronization: | 631 | video_channel_synchronization: |
612 | enabled: false | 632 | enabled: false |
613 | 633 | ||
@@ -768,9 +788,9 @@ search: | |||
768 | # You should deploy your own with https://framagit.org/framasoft/peertube/search-index, | 788 | # You should deploy your own with https://framagit.org/framasoft/peertube/search-index, |
769 | # and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index | 789 | # and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index |
770 | url: '' | 790 | url: '' |
771 | # You can disable local search, so users only use the search index | 791 | # You can disable local search in the client, so users only use the search index |
772 | disable_local_search: false | 792 | disable_local_search: false |
773 | # If you did not disable local search, you can decide to use the search index by default | 793 | # If you did not disable local search in the client, you can decide to use the search index by default |
774 | is_default_search: false | 794 | is_default_search: false |
775 | 795 | ||
776 | # PeerTube client/interface configuration | 796 | # PeerTube client/interface configuration |