From 3f974ce7db99fb231fafc93a505e052fa5a94c8b Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 31 Jan 2022 16:01:34 -0800 Subject: [PATCH] Remove references to config file. #1697 --- controllers/index.go | 2 +- core/data/config.go | 2 +- utils/utils.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/index.go b/controllers/index.go index b720beee2..9d7771864 100644 --- a/controllers/index.go +++ b/controllers/index.go @@ -80,7 +80,7 @@ func IndexHandler(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, path.Join(config.WebRoot, r.URL.Path)) } -// Return a basic HTML page with server-rendered metadata from the config file +// Return a basic HTML page with server-rendered metadata from the config // to give to Opengraph clients and web scrapers (bots, web crawlers, etc). func handleScraperMetadataPage(w http.ResponseWriter, r *http.Request) { tmpl, err := static.GetBotMetadataTemplate() diff --git a/core/data/config.go b/core/data/config.go index cc5083743..08662b835 100644 --- a/core/data/config.go +++ b/core/data/config.go @@ -541,7 +541,7 @@ func GetVideoCodec() string { // VerifySettings will perform a sanity check for specific settings values. func VerifySettings() error { if GetStreamKey() == "" { - return errors.New("no stream key set. Please set one in your config file") + return errors.New("no stream key set. Please set one via the admin or command line arguments.") } logoPath := GetLogoPath() diff --git a/utils/utils.go b/utils/utils.go index e3cb121f4..b02b1698c 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -232,7 +232,7 @@ func ValidatedFfmpegPath(ffmpegPath string) string { cmd := exec.Command("which", "ffmpeg") out, err := cmd.CombinedOutput() if err != nil { - log.Fatalln("Unable to determine path to ffmpeg. Please specify it in the config file.") + log.Fatalln("Unable to determine path to ffmpeg. Please specify it in the admin or place a copy in the Owncast directory.") } path := strings.TrimSpace(string(out))