Merge 3499e37 into 7b77bcf

mattermost · Apr 10, 2017 · 1393edf · 1393edf
2 parents 7b77bcf + 3499e37
commit 1393edf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/config/config.json b/config/config.json
@@ -73,7 +73,7 @@
         "MaxIdleConns": 20,
         "MaxOpenConns": 300,
         "Trace": false,
-        "AtRestEncryptKey": ""
+        "AtRestEncryptKey": "qd4cozue64i4ktsp5tkeyx7keex66y67"
     },
     "LogSettings": {
         "EnableConsole": true,
@@ -97,7 +97,7 @@
         "DriverName": "local",
         "Directory": "./data/",
         "EnablePublicLink": false,
-        "PublicLinkSalt": "",
+        "PublicLinkSalt": "zwsjzeff7pxxsqaqr6dps7r98xpyof7u",
         "ThumbnailWidth": 120,
         "ThumbnailHeight": 100,
         "PreviewWidth": 1024,
@@ -126,8 +126,8 @@
         "SMTPServer": "dockerhost",
         "SMTPPort": "2500",
         "ConnectionSecurity": "",
-        "InviteSalt": "",
-        "PasswordResetSalt": "",
+        "InviteSalt": "4orzipzdhawic5gctixtdiysd84h756j",
+        "PasswordResetSalt": "d18e8sse3of4ficxffb13yknhc91wce3",
         "SendPushNotifications": false,
         "PushNotificationServer": "",
         "PushNotificationContents": "generic",

diff --git a/model/user.go b/model/user.go
@@ -32,7 +32,7 @@ const (
 
 	USER_EMAIL_MAX_LENGTH     = 128
 	USER_NICKNAME_MAX_RUNES   = 64
-	USER_POSITION_MAX_RUNES   = 35
+	USER_POSITION_MAX_RUNES   = 64
 	USER_FIRST_NAME_MAX_RUNES = 64
 	USER_LAST_NAME_MAX_RUNES  = 64
 	USER_AUTH_DATA_MAX_LENGTH = 128