summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
Diffstat (limited to 'model')
-rw-r--r--model/client.go1
-rw-r--r--model/config.go26
2 files changed, 12 insertions, 15 deletions
diff --git a/model/client.go b/model/client.go
index 823e859cf..d13ffa6cb 100644
--- a/model/client.go
+++ b/model/client.go
@@ -21,6 +21,7 @@ const (
HEADER_ETAG_SERVER = "ETag"
HEADER_ETAG_CLIENT = "If-None-Match"
HEADER_FORWARDED = "X-Forwarded-For"
+ HEADER_REAL_IP = "X-Real-IP"
HEADER_FORWARDED_PROTO = "X-Forwarded-Proto"
HEADER_TOKEN = "token"
HEADER_BEARER = "BEARER"
diff --git a/model/config.go b/model/config.go
index 876c36e98..7791c4021 100644
--- a/model/config.go
+++ b/model/config.go
@@ -20,23 +20,16 @@ const (
)
type ServiceSettings struct {
- Mode string
- AllowTesting bool
- UseSSL bool
- Port string
- Version string
- InviteSalt string
- PublicLinkSalt string
- ResetSalt string
- AnalyticsUrl string
- AllowedLoginAttempts int
- EnableOAuthServiceProvider bool
+ ListenAddress string
+ MaximumLoginAttempts int
SegmentDeveloperKey string
GoogleDeveloperKey string
+ EnableOAuthServiceProvider bool
+ EnableTesting bool
}
type SSOSettings struct {
- Allow bool
+ Enable bool
Secret string
Id string
Scope string
@@ -56,9 +49,9 @@ type SqlSettings struct {
}
type LogSettings struct {
- ConsoleEnable bool
+ EnableConsole bool
ConsoleLevel string
- FileEnable bool
+ EnableFile bool
FileLevel string
FileFormat string
FileLocation string
@@ -68,6 +61,7 @@ type ImageSettings struct {
DriverName string
Directory string
EnablePublicLink bool
+ PublicLinkSalt string
ThumbnailWidth uint
ThumbnailHeight uint
PreviewWidth uint
@@ -82,7 +76,7 @@ type ImageSettings struct {
}
type EmailSettings struct {
- AllowSignUpWithEmail bool
+ EnableSignUpWithEmail bool
SendEmailNotifications bool
RequireEmailVerification bool
FeedbackName string
@@ -92,6 +86,8 @@ type EmailSettings struct {
SMTPServer string
SMTPPort string
ConnectionSecurity string
+ InviteSalt string
+ PasswordResetSalt string
// For Future Use
ApplePushServer string