diff options
author | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
commit | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (patch) | |
tree | 4b791b279109a10a66b62aaeeeae3d5243d2961b /api4/system.go | |
parent | fadcdd271a68b38571b75d1d38ab023f940ac83a (diff) | |
parent | 4b675b347b5241def7807fab5e01ce9b98531815 (diff) | |
download | chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.gz chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.bz2 chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api4/system.go')
-rw-r--r-- | api4/system.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api4/system.go b/api4/system.go index c1541f0b5..7b63afc0b 100644 --- a/api4/system.go +++ b/api4/system.go @@ -395,6 +395,10 @@ func testS3(c *Context, w http.ResponseWriter, r *http.Request) { return } + if cfg.FileSettings.AmazonS3SecretAccessKey == model.FAKE_SETTING { + cfg.FileSettings.AmazonS3SecretAccessKey = c.App.Config().FileSettings.AmazonS3SecretAccessKey + } + license := c.App.License() backend, appErr := utils.NewFileBackend(&cfg.FileSettings, license != nil && *license.Features.Compliance) if appErr == nil { |