diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 6 | ||||
| -rw-r--r-- | model/config_test.go | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 55fe8490b..1717d61a0 100644 --- a/model/config.go +++ b/model/config.go @@ -262,6 +262,7 @@ type FileSettings struct { AmazonS3Endpoint string AmazonS3SSL *bool AmazonS3SignV2 *bool + AmazonS3SSE *bool } type EmailSettings struct { @@ -551,6 +552,11 @@ func (o *Config) SetDefaults() { // Signature v2 is not enabled by default. } + if o.FileSettings.AmazonS3SSE == nil { + o.FileSettings.AmazonS3SSE = new(bool) + *o.FileSettings.AmazonS3SSE = false // Not Encrypted by default. + } + if o.FileSettings.EnableFileAttachments == nil { o.FileSettings.EnableFileAttachments = new(bool) *o.FileSettings.EnableFileAttachments = true diff --git a/model/config_test.go b/model/config_test.go index 1a944710f..f10e2d0cd 100644 --- a/model/config_test.go +++ b/model/config_test.go @@ -24,3 +24,12 @@ func TestConfigDefaultEmailNotificationContentsType(t *testing.T) { t.Fatal("EmailSettings.EmailNotificationContentsType should default to 'full'") } } + +func TestConfigDefaultFileSettingsS3SSE(t *testing.T) { + c1 := Config{} + c1.SetDefaults() + + if *c1.FileSettings.AmazonS3SSE != false { + t.Fatal("FileSettings.AmazonS3SSE should default to false") + } +} |