summaryrefslogtreecommitdiffstats
path: root/cmd/platform
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-10-26 13:21:35 -0400
committerGitHub <noreply@github.com>2017-10-26 13:21:35 -0400
commita0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2 (patch)
tree376ca7c1b969b6d7efbf5fb608d9afc157452c39 /cmd/platform
parent6f6005c617799e2f51071f43af718e5d4e77492b (diff)
downloadchat-a0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2.tar.gz
chat-a0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2.tar.bz2
chat-a0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2.zip
Add config setting to configure plugins directory (#7725)
Diffstat (limited to 'cmd/platform')
-rw-r--r--cmd/platform/server.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index d0065245f..05e527462 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -74,7 +74,7 @@ func runServer(configFileLocation string) {
a.InitBuiltInPlugins()
if webappDir, ok := utils.FindDir(model.CLIENT_DIR); ok {
- a.InitPlugins("plugins", webappDir+"/plugins")
+ a.InitPlugins(*a.Config().PluginSettings.Directory, webappDir+"/plugins")
} else {
l4g.Error("Unable to find webapp directory, could not initialize plugins")
}