diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 44 | ||||
| -rw-r--r-- | model/oauth.go | 2 |
2 files changed, 30 insertions, 16 deletions
diff --git a/model/config.go b/model/config.go index 38ef81a85..a4792ff9e 100644 --- a/model/config.go +++ b/model/config.go @@ -68,21 +68,25 @@ type LogSettings struct { } type FileSettings struct { - DriverName string - Directory string - EnablePublicLink bool - PublicLinkSalt string - ThumbnailWidth int - ThumbnailHeight int - PreviewWidth int - PreviewHeight int - ProfileWidth int - ProfileHeight int - InitialFont string - AmazonS3AccessKeyId string - AmazonS3SecretAccessKey string - AmazonS3Bucket string - AmazonS3Region string + DriverName string + Directory string + EnablePublicLink bool + PublicLinkSalt string + ThumbnailWidth int + ThumbnailHeight int + PreviewWidth int + PreviewHeight int + ProfileWidth int + ProfileHeight int + InitialFont string + AmazonS3AccessKeyId string + AmazonS3SecretAccessKey string + AmazonS3Bucket string + AmazonS3Region string + AmazonS3Endpoint string + AmazonS3BucketEndpoint string + AmazonS3LocationConstraint *bool + AmazonS3LowercaseBucket *bool } type EmailSettings struct { @@ -210,6 +214,16 @@ func (o *Config) SetDefaults() { o.FileSettings.PublicLinkSalt = NewRandomString(32) } + if o.FileSettings.AmazonS3LocationConstraint == nil { + o.FileSettings.AmazonS3LocationConstraint = new(bool) + *o.FileSettings.AmazonS3LocationConstraint = false + } + + if o.FileSettings.AmazonS3LowercaseBucket == nil { + o.FileSettings.AmazonS3LowercaseBucket = new(bool) + *o.FileSettings.AmazonS3LowercaseBucket = false + } + if len(o.EmailSettings.InviteSalt) == 0 { o.EmailSettings.InviteSalt = NewRandomString(32) } diff --git a/model/oauth.go b/model/oauth.go index 67825dd97..448fd9dc9 100644 --- a/model/oauth.go +++ b/model/oauth.go @@ -13,7 +13,7 @@ import ( type OAuthApp struct { Id string `json:"id"` CreatorId string `json:"creator_id"` - CreateAt int64 `json:"update_at"` + CreateAt int64 `json:"create_at"` UpdateAt int64 `json:"update_at"` ClientSecret string `json:"client_secret"` Name string `json:"name"` |