summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-22 12:12:50 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-22 12:12:50 -0700
commit88e5a71e8c93b495cedaa07931a4f8052d9f12ed (patch)
tree603174fc3758d56b8a027b9e1fbe1a5d8690b3e6 /config/config.json
parent08a3acbb44b043b9bb56f9b96e91432352d06d1a (diff)
downloadchat-88e5a71e8c93b495cedaa07931a4f8052d9f12ed.tar.gz
chat-88e5a71e8c93b495cedaa07931a4f8052d9f12ed.tar.bz2
chat-88e5a71e8c93b495cedaa07931a4f8052d9f12ed.zip
Adding service settings to admin console
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json28
1 files changed, 12 insertions, 16 deletions
diff --git a/config/config.json b/config/config.json
index 12926bee5..4b5a16300 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,18 +1,11 @@
{
"ServiceSettings": {
- "Mode": "dev",
- "AllowTesting": false,
- "UseSSL": false,
- "Port": "8065",
- "Version": "developer",
- "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
- "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
- "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
- "AnalyticsUrl": "",
- "AllowedLoginAttempts": 10,
- "EnableOAuthServiceProvider": false,
+ "ListenAddress": ":8065",
+ "MaximumLoginAttempts": 10,
"SegmentDeveloperKey": "",
- "GoogleDeveloperKey": ""
+ "GoogleDeveloperKey": "",
+ "EnableOAuthServiceProvider": false,
+ "EnableTesting": false
},
"TeamSettings": {
"SiteName": "Mattermost",
@@ -32,9 +25,9 @@
"AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"
},
"LogSettings": {
- "ConsoleEnable": true,
+ "EnableConsole": true,
"ConsoleLevel": "DEBUG",
- "FileEnable": true,
+ "EnableFile": true,
"FileLevel": "INFO",
"FileFormat": "",
"FileLocation": ""
@@ -43,6 +36,7 @@
"DriverName": "local",
"Directory": "./data/",
"EnablePublicLink": true,
+ "PublicLinkSalt": "LhaAWC6lYEKHTkBKsvyXNIOfUIT37AX",
"ThumbnailWidth": 120,
"ThumbnailHeight": 100,
"PreviewWidth": 1024,
@@ -56,7 +50,7 @@
"AmazonS3Region": ""
},
"EmailSettings": {
- "AllowSignUpWithEmail": true,
+ "EnableSignUpWithEmail": true,
"SendEmailNotifications": false,
"RequireEmailVerification": false,
"FeedbackName": "",
@@ -66,6 +60,8 @@
"SMTPServer": "",
"SMTPPort": "",
"ConnectionSecurity": "",
+ "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo",
+ "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5e",
"ApplePushServer": "",
"ApplePushCertPublic": "",
"ApplePushCertPrivate": ""
@@ -82,7 +78,7 @@
"ShowFullName": true
},
"GitLabSettings": {
- "Allow": false,
+ "Enable": false,
"Secret": "",
"Id": "",
"Scope": "",