From 4f20856ed4d7f5bc0e85ad40b58af8014dba48db Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 11 Jan 2021 09:20:44 +0100
Subject: [PATCH] Add more hints regarding live port

---
 .../edit-custom-config/edit-custom-config.component.html     | 5 +++--
 .../edit-custom-config/edit-custom-config.component.ts       | 4 ++++
 client/src/app/core/server/server.service.ts                 | 3 +++
 config/default.yaml                                          | 1 +
 config/production.yaml.example                               | 1 +
 server/controllers/api/config.ts                             | 4 ++++
 shared/models/server/server-config.model.ts                  | 4 ++++
 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 @@
                     <ng-container i18n>Allow live streaming</ng-container>
                   </ng-template>
 
-                  <ng-container ngProjectAs="description" i18n>
-                    ⚠️ Enabling live streaming requires trust in your users and extra moderation work
+                  <ng-container ngProjectAs="description">
+                    <div i18n>⚠️ Enabling live streaming requires trust in your users and extra moderation work</div>
+                    <div i18n>If enabled, your server needs to accept incoming TCP traffic on port {{ liveRTMPPort }}</div>
                   </ng-container>
 
                   <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
       .map(t => t.name)
   }
 
+  get liveRTMPPort () {
+    return this.serverConfig.live.rtmp.port
+  }
+
   getTotalTranscodingThreads () {
     const transcodingEnabled = this.form.value['transcoding']['enabled']
     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 {
       transcoding: {
         enabled: false,
         enabledResolutions: []
+      },
+      rtmp: {
+        port: 1935
       }
     },
     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:
   # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
   allow_replay: false
 
+  # Your firewall should accept traffic from this port in TCP if you enable live
   rtmp:
     port: 1935
 
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:
   # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
   allow_replay: true
 
+  # Your firewall should accept traffic from this port in TCP if you enable live
   rtmp:
     port: 1935
 
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) {
       transcoding: {
         enabled: CONFIG.LIVE.TRANSCODING.ENABLED,
         enabledResolutions: getEnabledResolutions('live')
+      },
+
+      rtmp: {
+        port: CONFIG.LIVE.RTMP.PORT
       }
     },
     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 {
 
       enabledResolutions: number[]
     }
+
+    rtmp: {
+      port: number
+    }
   }
 
   import: {
-- 
2.41.0