summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go1
-rw-r--r--utils/license.go4
2 files changed, 2 insertions, 3 deletions
diff --git a/utils/config.go b/utils/config.go
index 7863a0c7c..bcc2054b3 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -35,7 +35,6 @@ const (
var originalDisableDebugLvl l4g.Level = l4g.DEBUG
var siteURL = ""
-var Cfg *model.Config
func GetSiteURL() string {
return siteURL
diff --git a/utils/license.go b/utils/license.go
index fa731c6b5..2aaa2a549 100644
--- a/utils/license.go
+++ b/utils/license.go
@@ -168,8 +168,8 @@ func ValidateLicense(signed []byte) (bool, string) {
return true, string(plaintext)
}
-func GetAndValidateLicenseFileFromDisk() (*model.License, []byte) {
- fileName := GetLicenseFileLocation(*Cfg.ServiceSettings.LicenseFileLocation)
+func GetAndValidateLicenseFileFromDisk(location string) (*model.License, []byte) {
+ fileName := GetLicenseFileLocation(location)
if _, err := os.Stat(fileName); err != nil {
l4g.Debug("We could not find the license key in the database or on disk at %v", fileName)