From 36777057f2b92bd3c0a222f2266eef2cc52f57d7 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 5 Dec 2017 13:25:49 -0500 Subject: PLT-8289 Added ability to change location of client plugins (#7942) --- model/config.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'model') diff --git a/model/config.go b/model/config.go index 232d40b22..ac1d034d4 100644 --- a/model/config.go +++ b/model/config.go @@ -149,7 +149,8 @@ const ( DATA_RETENTION_SETTINGS_DEFAULT_FILE_RETENTION_DAYS = 365 DATA_RETENTION_SETTINGS_DEFAULT_DELETION_JOB_START_TIME = "02:00" - PLUGIN_SETTINGS_DEFAULT_DIRECTORY = "./plugins" + PLUGIN_SETTINGS_DEFAULT_DIRECTORY = "./plugins" + PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY = "./client/plugins" ) type ServiceSettings struct { @@ -1476,11 +1477,12 @@ type PluginState struct { } type PluginSettings struct { - Enable *bool - EnableUploads *bool - Directory *string - Plugins map[string]interface{} - PluginStates map[string]*PluginState + Enable *bool + EnableUploads *bool + Directory *string + ClientDirectory *string + Plugins map[string]interface{} + PluginStates map[string]*PluginState } func (s *PluginSettings) SetDefaults() { @@ -1500,6 +1502,14 @@ func (s *PluginSettings) SetDefaults() { *s.Directory = PLUGIN_SETTINGS_DEFAULT_DIRECTORY } + if s.ClientDirectory == nil { + s.ClientDirectory = NewString(PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY) + } + + if *s.ClientDirectory == "" { + *s.ClientDirectory = PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY + } + if s.Plugins == nil { s.Plugins = make(map[string]interface{}) } -- cgit v1.2.3-1-g7c22