From 15f24b84ce73e518f51537100bcecc5ffc9422cc Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 13 Jul 2020 15:10:16 -0700 Subject: [PATCH] Make setting extraUserInfoFileName optional --- config-example.yaml | 1 - config/config.go | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config-example.yaml b/config-example.yaml index 35a8d6518..dea953155 100644 --- a/config-example.yaml +++ b/config-example.yaml @@ -2,7 +2,6 @@ instanceDetails: name: Owncast title: Owncast Demo Server summary: "This is brief summary of whom you are or what your stream is. You can read more about it at owncast.online. You can edit this description in your config file." - extraUserInfoFileName: "/static/content.md" logo: small: /img/logo128.png diff --git a/config/config.go b/config/config.go index 159e9d7bf..938fcd18b 100644 --- a/config/config.go +++ b/config/config.go @@ -207,5 +207,12 @@ func Load(filePath string, versionInfo string) error { Config.VersionInfo = versionInfo + // Defaults + + // This is relative to the webroot, not the project root. + if Config.InstanceDetails.ExtraInfoFile == "" { + Config.InstanceDetails.ExtraInfoFile = "/static/content.md" + } + return Config.verifySettings() }