diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-18 17:37:25 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-18 17:37:25 -0400 |
| commit | 5398c82e1b80c3160974e01afabbfd1c2a2420a7 (patch) | |
| tree | 74c9e48dcfe1c49b8225becb0daf4817d46f4edb /config | |
| parent | 86c7e7cacd0608648ac65ff32d21b948c7527715 (diff) | |
| download | chat-5398c82e1b80c3160974e01afabbfd1c2a2420a7.tar.gz chat-5398c82e1b80c3160974e01afabbfd1c2a2420a7.tar.bz2 chat-5398c82e1b80c3160974e01afabbfd1c2a2420a7.zip | |
Revert "Usernames must start with a letter (#5581)"
This reverts commit 2e911b77c3386833f8f0cea82c7b6b3e5583a08e.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/config.json b/config/config.json index c8a52bd86..d19027267 100644 --- a/config/config.json +++ b/config/config.json @@ -70,12 +70,12 @@ }, "SqlSettings": { "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s", + "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8\u0026readTimeout=30s\u0026writeTimeout=30s", "DataSourceReplicas": [], "MaxIdleConns": 20, "MaxOpenConns": 300, "Trace": false, - "AtRestEncryptKey": "" + "AtRestEncryptKey": "8s96y35qz5ihiz7w1jcecsqp5xnnkp13" }, "LogSettings": { "EnableConsole": true, @@ -99,7 +99,7 @@ "DriverName": "local", "Directory": "./data/", "EnablePublicLink": false, - "PublicLinkSalt": "", + "PublicLinkSalt": "1oidkhjpy4p54jwfrgwk7nhkzgwrq6ug", "ThumbnailWidth": 120, "ThumbnailHeight": 100, "PreviewWidth": 1024, @@ -128,8 +128,8 @@ "SMTPServer": "dockerhost", "SMTPPort": "2500", "ConnectionSecurity": "", - "InviteSalt": "", - "PasswordResetSalt": "", + "InviteSalt": "mtt8hrn4tmo5d8nz91jg3z7gr8xudb4z", + "PasswordResetSalt": "8j44cnpee8b46a34kpnnc6r8gy6dizts", "SendPushNotifications": false, "PushNotificationServer": "", "PushNotificationContents": "generic", @@ -264,4 +264,4 @@ "TurnUsername": "", "TurnSharedKey": "" } -} +}
\ No newline at end of file |