apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-09 01:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into cluster

Browse Source
This commit is contained in:
Ingo Oppermann
2022-10-04 17:24:59 +02:00
parent 963353e6a2 eb57fb5e70
commit f1e7d8efdf
8 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/api.go
View File

@@ -459,7 +459,12 @@ func (a *api) start() error {
host = "localhost"
}
template := "rtmp://" + host + ":" + port + cfg.RTMP.App + "/{name}"
template := "rtmp://" + host + ":" + port
if cfg.RTMP.App != "/" {
template += cfg.RTMP.App
}
template += "/{name}"
if len(cfg.RTMP.Token) != 0 {
template += "?token=" + cfg.RTMP.Token
}
@@ -665,8 +670,8 @@ func (a *api) start() error {
}
certmagic.DefaultACME.Agreed = true
certmagic.DefaultACME.Email = ""
certmagic.DefaultACME.CA = certmagic.LetsEncryptStagingCA
certmagic.DefaultACME.Email = cfg.TLS.Email
certmagic.DefaultACME.CA = certmagic.LetsEncryptProductionCA
certmagic.DefaultACME.DisableHTTPChallenge = false
certmagic.DefaultACME.DisableTLSALPNChallenge = true
certmagic.DefaultACME.Logger = nil