diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-21 17:34:13 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-21 17:34:13 -0700 |
| commit | 0529a494ae6b541f917522a20de92e3d36615f65 (patch) | |
| tree | 401c6faf7ca0eb90fdc9a88910d792c28b82ac02 /api/export.go | |
| parent | e863096358dd64ecf2de6efeec3db132cdc8d6b9 (diff) | |
| download | chat-0529a494ae6b541f917522a20de92e3d36615f65.tar.gz chat-0529a494ae6b541f917522a20de92e3d36615f65.tar.bz2 chat-0529a494ae6b541f917522a20de92e3d36615f65.zip | |
Adding image properties
Diffstat (limited to 'api/export.go')
| -rw-r--r-- | api/export.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/export.go b/api/export.go index 9345f892f..6d7698282 100644 --- a/api/export.go +++ b/api/export.go @@ -278,11 +278,11 @@ func copyDirToExportWriter(writer ExportWriter, inPath string, outPath string) * } func ExportLocalStorage(writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { - teamDir := utils.Cfg.ServiceSettings.StorageDirectory + "teams/" + teamId + teamDir := utils.Cfg.ImageSettings.Directory + "teams/" + teamId - if utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage { + if utils.Cfg.ImageSettings.DriverName == model.IMAGE_DRIVER_S3 { return model.NewAppError("ExportLocalStorage", "S3 is not supported for local storage export.", "") - } else if utils.Cfg.ServiceSettings.UseLocalStorage && len(utils.Cfg.ServiceSettings.StorageDirectory) > 0 { + } else if utils.Cfg.ImageSettings.DriverName == model.IMAGE_DRIVER_LOCAL { if err := copyDirToExportWriter(writer, teamDir, EXPORT_LOCAL_STORAGE_FOLDER); err != nil { return err } |