From 00bb4799899cbbcdf48b147639dee3cee7ea199b Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Fri, 31 Mar 2017 06:54:30 -0700
Subject: PLT-6090 adding ability to read license file from disk (#5895)

* PLT-6090 adding ability to read license file from disk

* Fixing unit test that fails only sometimes

* Fixing test that fails randomly
---
 model/config.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index 4486b64ad..e26bf90f1 100644
--- a/model/config.go
+++ b/model/config.go
@@ -111,6 +111,7 @@ const (
 
 type ServiceSettings struct {
 	SiteURL                                  *string
+	LicenseFileLocation                      *string
 	ListenAddress                            string
 	ConnectionSecurity                       *string
 	TLSCertFile                              *string
@@ -497,6 +498,10 @@ func (o *Config) SetDefaults() {
 		*o.ServiceSettings.SiteURL = SERVICE_SETTINGS_DEFAULT_SITE_URL
 	}
 
+	if o.ServiceSettings.LicenseFileLocation == nil {
+		o.ServiceSettings.LicenseFileLocation = new(string)
+	}
+
 	if o.ServiceSettings.EnableLinkPreviews == nil {
 		o.ServiceSettings.EnableLinkPreviews = new(bool)
 		*o.ServiceSettings.EnableLinkPreviews = false
-- 
cgit v1.2.3-1-g7c22