diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-06 03:42:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 03:42:18 +0800 |
| commit | 8d680cf64ec7fb6c8b242b8048989d0f0550cb68 (patch) | |
| tree | 700d39986d1973b51c875ab9bf50241762fc3e54 /model | |
| parent | 7405f66036537095b52c277d9b56969df33bfa57 (diff) | |
| download | chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.tar.gz chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.tar.bz2 chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.zip | |
[PLT-7475] Add S3 region to system console and add S3 validation (#7373)
* add S3 region to system console and add S3 validation
* update translation message
* add bool as return value to Validate* functions
* update Validate* functions to be pure
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/model/config.go b/model/config.go index 311a43261..c6fd84ed0 100644 --- a/model/config.go +++ b/model/config.go @@ -88,6 +88,9 @@ const ( SQL_SETTINGS_DEFAULT_DATA_SOURCE = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s" + FILE_SETTINGS_DEFAULT_AMAZON_S3_ENDPOINT = "s3.amazonaws.com" + FILE_SETTINGS_DEFAULT_AMAZON_S3_REGION = "us-east-1" + EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION = "" SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK = "https://about.mattermost.com/default-terms/" @@ -266,9 +269,9 @@ type FileSettings struct { InitialFont string AmazonS3AccessKeyId string AmazonS3SecretAccessKey string - AmazonS3Bucket string - AmazonS3Region string - AmazonS3Endpoint string + AmazonS3Bucket *string + AmazonS3Region *string + AmazonS3Endpoint *string AmazonS3SSL *bool AmazonS3SignV2 *bool AmazonS3SSE *bool @@ -588,9 +591,19 @@ func (o *Config) SetDefaults() { *o.FileSettings.DriverName = IMAGE_DRIVER_LOCAL } - if o.FileSettings.AmazonS3Endpoint == "" { - // Defaults to "s3.amazonaws.com" - o.FileSettings.AmazonS3Endpoint = "s3.amazonaws.com" + if o.FileSettings.AmazonS3Bucket == nil { + o.FileSettings.AmazonS3Bucket = new(string) + *o.FileSettings.AmazonS3Bucket = "" + } + + if o.FileSettings.AmazonS3Region == nil { + o.FileSettings.AmazonS3Region = new(string) + *o.FileSettings.AmazonS3Region = FILE_SETTINGS_DEFAULT_AMAZON_S3_REGION + } + + if o.FileSettings.AmazonS3Endpoint == nil { + o.FileSettings.AmazonS3Endpoint = new(string) + *o.FileSettings.AmazonS3Endpoint = FILE_SETTINGS_DEFAULT_AMAZON_S3_ENDPOINT } if o.FileSettings.AmazonS3SSL == nil { |