aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml4
-rw-r--r--config/production.yaml.example4
-rw-r--r--config/test-1.yaml3
-rw-r--r--config/test-3.yaml3
-rw-r--r--config/test-4.yaml3
-rw-r--r--config/test-5.yaml3
-rw-r--r--config/test-6.yaml3
-rw-r--r--config/test.yaml3
8 files changed, 26 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 23be08f85..1e7fb9e5b 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -425,6 +425,10 @@ live:
425 1440p: false 425 1440p: false
426 2160p: false 426 2160p: false
427 427
428video_editor:
429 # Enable video edition by users (cut, add intro/outro, add watermark etc)
430 enabled: false
431
428import: 432import:
429 # Add ability for your users to import remote videos (from YouTube, torrent...) 433 # Add ability for your users to import remote videos (from YouTube, torrent...)
430 videos: 434 videos:
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 675801caa..d1f18ecde 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -433,6 +433,10 @@ live:
433 1440p: false 433 1440p: false
434 2160p: false 434 2160p: false
435 435
436video_editor:
437 # Enable video edition by users (cut, add intro/outro, add watermark etc)
438 enabled: false
439
436import: 440import:
437 # Add ability for your users to import remote videos (from YouTube, torrent...) 441 # Add ability for your users to import remote videos (from YouTube, torrent...)
438 videos: 442 videos:
diff --git a/config/test-1.yaml b/config/test-1.yaml
index d5f8299e0..0f6d56f1a 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -37,6 +37,9 @@ signup:
37transcoding: 37transcoding:
38 enabled: false 38 enabled: false
39 39
40video_editor:
41 enabled: false
42
40live: 43live:
41 rtmp: 44 rtmp:
42 port: 1936 45 port: 1936
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 594439b62..3cd3ddba7 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -30,3 +30,6 @@ admin:
30 30
31transcoding: 31transcoding:
32 enabled: false 32 enabled: false
33
34video_editor:
35 enabled: false
diff --git a/config/test-4.yaml b/config/test-4.yaml
index 1e6368bf7..6d8e51945 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -30,3 +30,6 @@ admin:
30 30
31transcoding: 31transcoding:
32 enabled: false 32 enabled: false
33
34video_editor:
35 enabled: false
diff --git a/config/test-5.yaml b/config/test-5.yaml
index 97f18a7a0..5f2157fec 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -30,3 +30,6 @@ admin:
30 30
31transcoding: 31transcoding:
32 enabled: false 32 enabled: false
33
34video_editor:
35 enabled: false
diff --git a/config/test-6.yaml b/config/test-6.yaml
index 156da84d2..9c43d2b2e 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -30,3 +30,6 @@ admin:
30 30
31transcoding: 31transcoding:
32 enabled: false 32 enabled: false
33
34video_editor:
35 enabled: false
diff --git a/config/test.yaml b/config/test.yaml
index 461e1b4ba..99bf85143 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -164,3 +164,6 @@ views:
164 164
165 local_buffer_update_interval: '5 seconds' 165 local_buffer_update_interval: '5 seconds'
166 ip_view_expiration: '1 second' 166 ip_view_expiration: '1 second'
167
168video_editor:
169 enabled: true