LogalDeveloper/owncast
0
Fork 0
Code Activity

Do not support stream key UI or any persisted stream keys when overridden via cli flag. Closes #2749

Browse Source
This commit is contained in:
Gabe Kangas
2023-02-27 17:08:52 -08:00
parent 48dd490a50
commit 23a721857f
6 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/admin/serverConfig.go
View File

@@ -52,6 +52,7 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) {
FFmpegPath: ffmpeg,
AdminPassword: data.GetAdminPassword(),
StreamKeys: data.GetStreamKeys(),
StreamKeyOverridden: config.TemporaryStreamKey != "",
WebServerPort: config.WebServerPort,
WebServerIP: config.WebServerIP,
RTMPServerPort: data.GetRTMPPortNumber(),
@@ -101,6 +102,7 @@ type serverConfigAdminResponse struct {
FFmpegPath string `json:"ffmpegPath"`
AdminPassword string `json:"adminPassword"`
StreamKeys []models.StreamKey `json:"streamKeys"`
StreamKeyOverridden bool `json:"streamKeyOverridden"`
WebServerPort int `json:"webServerPort"`
WebServerIP string `json:"webServerIP"`
RTMPServerPort int `json:"rtmpServerPort"`