diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-17 21:00:59 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-17 21:00:59 -0700 |
| commit | 44714dfcb18b9a393dc34be3c182b0c092eec28a (patch) | |
| tree | 117bc8a3bc37f9112abf5498248c779081df514f /config/config.json | |
| parent | 82127341cacd4299f9a59e76b5f68d6d7222c45b (diff) | |
| download | chat-44714dfcb18b9a393dc34be3c182b0c092eec28a.tar.gz chat-44714dfcb18b9a393dc34be3c182b0c092eec28a.tar.bz2 chat-44714dfcb18b9a393dc34be3c182b0c092eec28a.zip | |
PLT-11 Adding ability to save config file
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/config/config.json b/config/config.json index 4c4fbb255..38948641c 100644 --- a/config/config.json +++ b/config/config.json @@ -9,13 +9,11 @@ }, "ServiceSettings": { "SiteName": "Mattermost", - "Mode" : "dev", - "AllowTesting" : false, + "Mode": "dev", + "AllowTesting": false, "UseSSL": false, "Port": "8065", "Version": "developer", - "Shards": { - }, "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", @@ -26,21 +24,12 @@ "DisableEmailSignUp": false, "EnableOAuthServiceProvider": false }, - "SSOSettings": { - "gitlab": { - "Allow": false, - "Secret" : "", - "Id": "", - "Scope": "", - "AuthEndpoint": "", - "TokenEndpoint": "", - "UserApiEndpoint": "" - } - }, "SqlSettings": { "DriverName": "mysql", "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8", - "DataSourceReplicas": ["mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"], + "DataSourceReplicas": [ + "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8" + ], "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, @@ -62,7 +51,7 @@ "InitialFont": "luximbi.ttf" }, "EmailSettings": { - "ByPassEmail" : true, + "ByPassEmail": true, "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", @@ -95,8 +84,20 @@ "MaxUsersPerTeam": 150, "AllowPublicLink": true, "AllowValetDefault": false, + "TourLink": "", "DefaultThemeColor": "#2389D7", "DisableTeamCreation": false, "RestrictCreationToDomains": "" + }, + "SSOSettings": { + "gitlab": { + "Allow": false, + "Secret": "", + "Id": "", + "Scope": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + } } -} +}
\ No newline at end of file |