From 768fe6bec344cf4154a39767000c04ce1a5b5a71 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Thu, 22 Dec 2016 20:59:04 +0100 Subject: fix GH-4857 | Add a default value for the FileSettings.InitialFont (#4878) --- model/config.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/model/config.go b/model/config.go index 29fa995fd..c28e02e18 100644 --- a/model/config.go +++ b/model/config.go @@ -391,23 +391,32 @@ func (o *Config) SetDefaults() { // Defaults to "s3.amazonaws.com" o.FileSettings.AmazonS3Endpoint = "s3.amazonaws.com" } + if o.FileSettings.AmazonS3Region == "" { // Defaults to "us-east-1" region. o.FileSettings.AmazonS3Region = "us-east-1" } + if o.FileSettings.AmazonS3SSL == nil { o.FileSettings.AmazonS3SSL = new(bool) *o.FileSettings.AmazonS3SSL = true // Secure by default. } + if o.FileSettings.MaxFileSize == nil { o.FileSettings.MaxFileSize = new(int64) *o.FileSettings.MaxFileSize = 52428800 // 50 MB } + if len(*o.FileSettings.PublicLinkSalt) == 0 { o.FileSettings.PublicLinkSalt = new(string) *o.FileSettings.PublicLinkSalt = NewRandomString(32) } + if o.FileSettings.InitialFont == "" { + // Defaults to "luximbi.ttf" + o.FileSettings.InitialFont = "luximbi.ttf" + } + if len(o.EmailSettings.InviteSalt) == 0 { o.EmailSettings.InviteSalt = NewRandomString(32) } -- cgit v1.2.3-1-g7c22