Browse Source

Remove references to config file. #1697

pull/1715/head
Gabe Kangas 4 years ago
parent
commit
3f974ce7db
No known key found for this signature in database
GPG Key ID: 9A56337728BC81EA
  1. 2
      controllers/index.go
  2. 2
      core/data/config.go
  3. 2
      utils/utils.go

2
controllers/index.go

@ -80,7 +80,7 @@ func IndexHandler(w http.ResponseWriter, r *http.Request) { @@ -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()

2
core/data/config.go

@ -541,7 +541,7 @@ func GetVideoCodec() string { @@ -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()

2
utils/utils.go

@ -232,7 +232,7 @@ func ValidatedFfmpegPath(ffmpegPath string) string { @@ -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))

Loading…
Cancel
Save