diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 16:01:02 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 16:01:02 -0500 |
| commit | c209e4457457edc042f063390c9a222a694f3a6d (patch) | |
| tree | 5e1653318a6a14bcad80025793adab0f700deed9 /utils/file_backend.go | |
| parent | 62efb1df754bfe6b10a3c17ca6f89fd33b991f56 (diff) | |
| download | chat-c209e4457457edc042f063390c9a222a694f3a6d.tar.gz chat-c209e4457457edc042f063390c9a222a694f3a6d.tar.bz2 chat-c209e4457457edc042f063390c9a222a694f3a6d.zip | |
revert master changes
Diffstat (limited to 'utils/file_backend.go')
| -rw-r--r-- | utils/file_backend.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/file_backend.go b/utils/file_backend.go index 42af7f604..c7a6c5591 100644 --- a/utils/file_backend.go +++ b/utils/file_backend.go @@ -22,7 +22,7 @@ type FileBackend interface { RemoveDirectory(path string) *model.AppError } -func NewFileBackend(settings *model.FileSettings, enableComplianceFeatures bool) (FileBackend, *model.AppError) { +func NewFileBackend(settings *model.FileSettings) (FileBackend, *model.AppError) { switch *settings.DriverName { case model.IMAGE_DRIVER_S3: return &S3FileBackend{ @@ -33,7 +33,7 @@ func NewFileBackend(settings *model.FileSettings, enableComplianceFeatures bool) signV2: settings.AmazonS3SignV2 != nil && *settings.AmazonS3SignV2, region: settings.AmazonS3Region, bucket: settings.AmazonS3Bucket, - encrypt: settings.AmazonS3SSE != nil && *settings.AmazonS3SSE && enableComplianceFeatures, + encrypt: settings.AmazonS3SSE != nil && *settings.AmazonS3SSE && IsLicensed() && *License().Features.Compliance, trace: settings.AmazonS3Trace != nil && *settings.AmazonS3Trace, }, nil case model.IMAGE_DRIVER_LOCAL: |