diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-18 18:11:01 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-18 18:11:01 -0400 |
| commit | 679e20aa4b74b468c7e372c77219142599f2385d (patch) | |
| tree | 544b2a5f932dc2a2cbd27a800fddcb4ce07b057e /config | |
| parent | 676f2a63999e51a03f2f57209ce4c9f106683da4 (diff) | |
| parent | cdf813f07b207c14bb9fa03f38d734b45e40823e (diff) | |
| download | chat-679e20aa4b74b468c7e372c77219142599f2385d.tar.gz chat-679e20aa4b74b468c7e372c77219142599f2385d.tar.bz2 chat-679e20aa4b74b468c7e372c77219142599f2385d.zip | |
Merge pull request #709 from mattermost/PLT-11
PLT-11 adding config for logs to UI
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/config/config.json b/config/config.json index 3ef2c317b..38948641c 100644 --- a/config/config.json +++ b/config/config.json @@ -9,12 +9,11 @@ }, "ServiceSettings": { "SiteName": "Mattermost", - "Mode" : "dev", - "AllowTesting" : false, + "Mode": "dev", + "AllowTesting": false, "UseSSL": false, "Port": "8065", - "Shards": { - }, + "Version": "developer", "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", @@ -25,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, @@ -61,7 +51,7 @@ "InitialFont": "luximbi.ttf" }, "EmailSettings": { - "ByPassEmail" : true, + "ByPassEmail": true, "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", @@ -94,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 |