aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-10-28 15:24:40 +0100
committerChocobozzz <chocobozzz@cpy.re>2020-11-09 15:33:04 +0100
commita056ca4813c82f490dcd31ac97a64d6bf76d3dcc (patch)
tree11a0638cb92eee94f404e294f54632212836a4a6 /shared
parentd846d99c6c81028bb7bd3cb20abd433cbf396a22 (diff)
downloadPeerTube-a056ca4813c82f490dcd31ac97a64d6bf76d3dcc.tar.gz
PeerTube-a056ca4813c82f490dcd31ac97a64d6bf76d3dcc.tar.zst
PeerTube-a056ca4813c82f490dcd31ac97a64d6bf76d3dcc.zip
Add max lives limit
Diffstat (limited to 'shared')
-rw-r--r--shared/extra-utils/server/config.ts2
-rw-r--r--shared/models/server/custom-config.model.ts3
-rw-r--r--shared/models/server/server-config.model.ts2
-rw-r--r--shared/models/server/server-error-code.enum.ts4
4 files changed, 10 insertions, 1 deletions
diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts
index bb7e23d54..7c1ad0a75 100644
--- a/shared/extra-utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -130,6 +130,8 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
130 enabled: true, 130 enabled: true,
131 allowReplay: false, 131 allowReplay: false,
132 maxDuration: null, 132 maxDuration: null,
133 maxInstanceLives: -1,
134 maxUserLives: 50,
133 transcoding: { 135 transcoding: {
134 enabled: true, 136 enabled: true,
135 threads: 4, 137 threads: 4,
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 11b2ef2eb..67e05e23f 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -99,7 +99,10 @@ export interface CustomConfig {
99 enabled: boolean 99 enabled: boolean
100 100
101 allowReplay: boolean 101 allowReplay: boolean
102
102 maxDuration: number 103 maxDuration: number
104 maxInstanceLives: number
105 maxUserLives: number
103 106
104 transcoding: { 107 transcoding: {
105 enabled: boolean 108 enabled: boolean
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 1563d848e..a01fcbe41 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -102,6 +102,8 @@ export interface ServerConfig {
102 enabled: boolean 102 enabled: boolean
103 103
104 maxDuration: number 104 maxDuration: number
105 maxInstanceLives: number
106 maxUserLives: number
105 allowReplay: boolean 107 allowReplay: boolean
106 108
107 transcoding: { 109 transcoding: {
diff --git a/shared/models/server/server-error-code.enum.ts b/shared/models/server/server-error-code.enum.ts
index 0bfb2c470..c02b0e6c7 100644
--- a/shared/models/server/server-error-code.enum.ts
+++ b/shared/models/server/server-error-code.enum.ts
@@ -1,3 +1,5 @@
1export const enum ServerErrorCode { 1export const enum ServerErrorCode {
2 DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS = 1 2 DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS = 1,
3 MAX_INSTANCE_LIVES_LIMIT_REACHED = 2,
4 MAX_USER_LIVES_LIMIT_REACHED = 3,
3} 5}