From a0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 26 Oct 2017 13:21:35 -0400 Subject: Add config setting to configure plugins directory (#7725) --- model/config.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'model') diff --git a/model/config.go b/model/config.go index f24208754..9871a13b4 100644 --- a/model/config.go +++ b/model/config.go @@ -147,6 +147,8 @@ const ( DATA_RETENTION_SETTINGS_DEFAULT_MESSAGE_RETENTION_DAYS = 365 DATA_RETENTION_SETTINGS_DEFAULT_FILE_RETENTION_DAYS = 365 DATA_RETENTION_SETTINGS_DEFAULT_DELETION_JOB_START_TIME = "02:00" + + PLUGIN_SETTINGS_DEFAULT_DIRECTORY = "./plugins" ) type ServiceSettings struct { @@ -515,6 +517,7 @@ type PluginState struct { type PluginSettings struct { Enable *bool EnableUploads *bool + Directory *string Plugins map[string]interface{} PluginStates map[string]*PluginState } @@ -1470,7 +1473,15 @@ func (o *Config) SetDefaults() { } if o.PluginSettings.EnableUploads == nil { - o.PluginSettings.Enable = NewBool(false) + o.PluginSettings.EnableUploads = NewBool(false) + } + + if o.PluginSettings.Directory == nil { + o.PluginSettings.Directory = NewString(PLUGIN_SETTINGS_DEFAULT_DIRECTORY) + } + + if *o.PluginSettings.Directory == "" { + *o.PluginSettings.Directory = PLUGIN_SETTINGS_DEFAULT_DIRECTORY } if o.PluginSettings.Plugins == nil { -- cgit v1.2.3-1-g7c22