diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-03-13 17:26:56 +0100 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2018-03-14 00:26:56 +0800 |
| commit | db4402c40dca7724416f1f6a38e4e256e871c302 (patch) | |
| tree | 4f7220368cdba1f7cbe154d0938301ea9c8caee9 /api4/system.go | |
| parent | caf9c2409935124db85daf5b04d61b7a663ebfc8 (diff) | |
| download | chat-db4402c40dca7724416f1f6a38e4e256e871c302.tar.gz chat-db4402c40dca7724416f1f6a38e4e256e871c302.tar.bz2 chat-db4402c40dca7724416f1f6a38e4e256e871c302.zip | |
remove s3 region to be mandatory and fix when user call test s3 when the config is saved (#8454)
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 { |