aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html5
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts4
-rw-r--r--client/src/app/core/server/server.service.ts3
-rw-r--r--config/default.yaml1
-rw-r--r--config/production.yaml.example1
-rw-r--r--server/controllers/api/config.ts4
-rw-r--r--shared/models/server/server-config.model.ts4
7 files changed, 20 insertions, 2 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index af8a4e18d..013784c6c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -889,8 +889,9 @@
889 <ng-container i18n>Allow live streaming</ng-container> 889 <ng-container i18n>Allow live streaming</ng-container>
890 </ng-template> 890 </ng-template>
891 891
892 <ng-container ngProjectAs="description" i18n> 892 <ng-container ngProjectAs="description">
893 ⚠️ Enabling live streaming requires trust in your users and extra moderation work 893 <div i18n>⚠️ Enabling live streaming requires trust in your users and extra moderation work</div>
894 <div i18n>If enabled, your server needs to accept incoming TCP traffic on port {{ liveRTMPPort }}</div>
894 </ng-container> 895 </ng-container>
895 896
896 <ng-container ngProjectAs="extra"> 897 <ng-container ngProjectAs="extra">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index c3a833843..f74229af0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -119,6 +119,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
119 .map(t => t.name) 119 .map(t => t.name)
120 } 120 }
121 121
122 get liveRTMPPort () {
123 return this.serverConfig.live.rtmp.port
124 }
125
122 getTotalTranscodingThreads () { 126 getTotalTranscodingThreads () {
123 const transcodingEnabled = this.form.value['transcoding']['enabled'] 127 const transcodingEnabled = this.form.value['transcoding']['enabled']
124 const transcodingThreads = this.form.value['transcoding']['threads'] 128 const transcodingThreads = this.form.value['transcoding']['threads']
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 1abf87118..b1d8fcf83 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -83,6 +83,9 @@ export class ServerService {
83 transcoding: { 83 transcoding: {
84 enabled: false, 84 enabled: false,
85 enabledResolutions: [] 85 enabledResolutions: []
86 },
87 rtmp: {
88 port: 1935
86 } 89 }
87 }, 90 },
88 avatar: { 91 avatar: {
diff --git a/config/default.yaml b/config/default.yaml
index 9d428f764..01e5c8480 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -264,6 +264,7 @@ live:
264 # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay 264 # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
265 allow_replay: false 265 allow_replay: false
266 266
267 # Your firewall should accept traffic from this port in TCP if you enable live
267 rtmp: 268 rtmp:
268 port: 1935 269 port: 1935
269 270
diff --git a/config/production.yaml.example b/config/production.yaml.example
index bcf727d82..a5cdedf35 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -278,6 +278,7 @@ live:
278 # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay 278 # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
279 allow_replay: true 279 allow_replay: true
280 280
281 # Your firewall should accept traffic from this port in TCP if you enable live
281 rtmp: 282 rtmp:
282 port: 1935 283 port: 1935
283 284
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index eb9f5f4b4..2401e2ff4 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -126,6 +126,10 @@ async function getConfig (req: express.Request, res: express.Response) {
126 transcoding: { 126 transcoding: {
127 enabled: CONFIG.LIVE.TRANSCODING.ENABLED, 127 enabled: CONFIG.LIVE.TRANSCODING.ENABLED,
128 enabledResolutions: getEnabledResolutions('live') 128 enabledResolutions: getEnabledResolutions('live')
129 },
130
131 rtmp: {
132 port: CONFIG.LIVE.RTMP.PORT
129 } 133 }
130 }, 134 },
131 import: { 135 import: {
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index a01fcbe41..2dcf98f4f 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -111,6 +111,10 @@ export interface ServerConfig {
111 111
112 enabledResolutions: number[] 112 enabledResolutions: number[]
113 } 113 }
114
115 rtmp: {
116 port: number
117 }
114 } 118 }
115 119
116 import: { 120 import: {